Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / SL / DB / Helper / CustomVariables.pm

diff --git a/SL/DB/Helper/CustomVariables.pm b/SL/DB/Helper/CustomVariables.pm
index 6b7a531..ef6a0a9 100644 (file)
--- a/SL/DB/Helper/CustomVariables.pm
+++ b/SL/DB/Helper/CustomVariables.pm
@@ -44,7 +44,7 @@ sub make_cvar_accessor {
   my ($caller_package, %params) = @_;
 
   my @module_filter = $params{module} ?
-    ("config.module" => $params{module}) :
+    ("config_id" => [ \"(SELECT custom_variable_configs.id FROM custom_variable_configs WHERE custom_variable_configs.module = '$params{module}')" ]) :
     ();
 
   $caller_package->meta->add_relationships(
@@ -52,7 +52,6 @@ sub make_cvar_accessor {
       type         => 'one to many',
       class        => 'SL::DB::CustomVariable',
       column_map   => { ($params{id} || 'id') => 'trans_id' },
-      manager_args => { with_objects => 'config' },
       query_args   => [ sub_module => $params{sub_module}, @module_filter ],
     }
   );
@@ -122,6 +121,7 @@ sub _all_configs {
 sub _overload_by_module {
   my ($module, %params) = @_;
 
+  keys %{ $params{overloads} }; # reset each iterator
   while (my ($fk, $class) = each %{ $params{overloads} }) {
     return ($fk, $class) if $class->meta->{META_CVARS()}->{module} eq $module;
   }