X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomVariableConfig.pm;h=1b780e5fc0441ef78616639b825bceb6e7508bd7;hb=461b3caf1c243642ea98e2b132335e4e907ed9d4;hp=d87b8ac92c53dab5ba8e218d41cdcc9f72fad456;hpb=2737667aa9394428f885187928509e7c5d0ec4d4;p=kivitendo-erp.git

diff --git a/SL/Controller/CustomVariableConfig.pm b/SL/Controller/CustomVariableConfig.pm
index d87b8ac92..1b780e5fc 100644
--- a/SL/Controller/CustomVariableConfig.pm
+++ b/SL/Controller/CustomVariableConfig.pm
@@ -7,8 +7,11 @@ use parent qw(SL::Controller::Base);
 use List::Util qw(first);
 
 use SL::DB::CustomVariableConfig;
+use SL::DB::CustomVariableValidity;
+use SL::DB::PartsGroup;
 use SL::Helper::Flash;
 use SL::Locale::String;
+use Data::Dumper;
 
 use Rose::Object::MakeMethods::Generic (
   scalar                  => [ qw(config module module_description flags) ],
@@ -59,12 +62,14 @@ sub action_new {
 sub show_form {
   my ($self, %params) = @_;
 
-  $self->flags([
-    map { split m/=/, 2 }
-    split m/;/, ($self->config->flags || '')
-  ]);
+  $self->flags({
+    map { split m/=/, $_, 2 }
+    split m/:/, ($self->config->flags || '')
+  });
 
-  $::request->layout->focus('#config_name');
+  $params{all_partsgroups} = SL::DB::Manager::PartsGroup->get_all();
+
+  $::request->layout->use_javascript("${_}.js") for qw(jquery.selectboxes jquery.multiselect2side);
   $self->render('custom_variable_config/form', %params);
 }
 
@@ -89,13 +94,16 @@ sub action_update {
 sub action_destroy {
   my ($self) = @_;
 
+  # delete relationship to partsgroups (for filter) before cvar can be deleted
+  $self->config->update_attributes(partsgroups => []);
+
   if (eval { $self->config->delete; 1; }) {
     flash_later('info',  t8('The custom variable has been deleted.'));
   } else {
     flash_later('error', t8('The custom variable is in use and cannot be deleted.'));
   }
 
-  $self->redirect_to(action => 'list');
+  $self->redirect_to(action => 'list', module => $self->module);
 }
 
 sub action_reorder {
@@ -103,7 +111,7 @@ sub action_reorder {
 
   SL::DB::CustomVariableConfig->reorder_list(@{ $::form->{cvarcfg_id} || [] });
 
-  $self->render(\'', { type => 'json' });
+  $self->render(\'', { type => 'json' }); # ' make emacs happy
 }
 
 #
@@ -150,12 +158,14 @@ sub init_translated_types {
 sub init_modules {
   my ($self, %params) = @_;
 
-  return [
-    { module => 'CT',       description => t8('Customers and vendors')          },
-    { module => 'Contacts', description => t8('Contact persons')                },
-    { module => 'IC',       description => t8('Parts, services and assemblies') },
-    { module => 'Projects', description => t8('Projects')                       },
-  ];
+  return [ sort { $a->{description}->translated cmp $b->{description}->translated } (
+    { module => 'CT',               description => t8('Customers and vendors')          },
+    { module => 'Contacts',         description => t8('Contact persons')                },
+    { module => 'IC',               description => t8('Parts, services and assemblies') },
+    { module => 'Projects',         description => t8('Projects')                       },
+    { module => 'RequirementSpecs', description => t8('Requirement Specs')              },
+    { module => 'ShipTo',           description => t8('Shipping Address')               },
+  )];
 }
 
 sub create_or_update {
@@ -165,6 +175,14 @@ sub create_or_update {
   my $params = delete($::form->{config}) || { };
   delete $params->{id};
 
+  if ($self->module eq 'IC') {
+    $params->{partsgroups} = [] if !$params->{flag_partsgroup_filter};
+  } else {
+    delete $params->{flag_partsgroup_filter};
+    $params->{partsgroups} = [];
+  }
+
+  $params->{partsgroups}       ||= []; # The list is empty, if control is not send by the browser.
   $params->{default_value}       = $::form->parse_amount(\%::myconfig, $params->{default_value}) if $params->{type} eq 'number';
   $params->{included_by_default} = 0                                                             if !$params->{includeable};
   $params->{flags}               = join ':', map { m/^flag_(.*)/; "${1}=" . delete($params->{$_}) } grep { m/^flag_/ } keys %{ $params };
@@ -179,10 +197,33 @@ sub create_or_update {
     return;
   }
 
-  $self->config->save;
+  SL::DB->client->with_transaction(sub {
+    my $dbh = SL::DB->client->dbh;
+
+    $self->config->save;
+    $self->_set_cvar_validity() if $is_new;
+    1;
+  }) or do { die SL::DB->client->error };
 
   flash_later('info', $is_new ? t8('The custom variable has been created.') : t8('The custom variable has been saved.'));
   $self->redirect_to(action => 'list', module => $self->module);
 }
 
+sub _set_cvar_validity {
+  my ($self) = @_;
+
+  my $flags = {
+    map { split m/=/, $_, 2 }
+    split m/:/, ($self->config->flags || '')
+  };
+
+  # nothing to do to set valid
+  return if !$flags->{defaults_to_invalid};
+
+  my $all_parts  = SL::DB::Manager::Part->get_all(where => [ or => [ obsolete => 0, obsolete => undef ] ]);
+  foreach my $part (@{ $all_parts }) {
+    SL::DB::CustomVariableValidity->new(config_id => $self->config->id, trans_id => $part->id)->save;
+  }
+}
+
 1;