SimpleSystemSetting: Umstellung von »Projekttypen« und »Projekstatus«

[kivitendo-erp.git] / SL / Controller / CustomVariableConfig.pm

diff --git a/SL/Controller/CustomVariableConfig.pm b/SL/Controller/CustomVariableConfig.pm
index ed7e844..1b780e5 100644 (file)
--- a/SL/Controller/CustomVariableConfig.pm
+++ b/SL/Controller/CustomVariableConfig.pm
@@ -158,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 {
@@ -195,13 +197,13 @@ sub create_or_update {
     return;
   }
 
-  my $dbh = $self->config->db;
-  $dbh->begin_work;
+  SL::DB->client->with_transaction(sub {
+    my $dbh = SL::DB->client->dbh;
 
-  $self->config->save;
-  $self->_set_cvar_validity() if $is_new;
-
-  $dbh->commit;
+    $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);