X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Famcvar.pl;h=343350a242de0151da1c0d795c9178cd93cc0418;hb=937e37ad007405c6a3a389ee18006379ffecc073;hp=3be956a727444ed71d454faf1ca7ad482472c4cc;hpb=e046efc943a4e19db6badaa6a4593888700ee5f2;p=kivitendo-erp.git

diff --git a/bin/mozilla/amcvar.pl b/bin/mozilla/amcvar.pl
index 3be956a72..343350a24 100644
--- a/bin/mozilla/amcvar.pl
+++ b/bin/mozilla/amcvar.pl
@@ -54,11 +54,15 @@ our %translations = ('text'      => $locale->text('Free-form text'),
                      'timestamp' => $locale->text('Timestamp'),
                      'bool'      => $locale->text('Yes/No (Checkbox)'),
                      'select'    => $locale->text('Selection'),
+                     'customer'  => $locale->text('Customer'),
+                     'vendor'    => $locale->text('Vendor'),
+                     'part'      => $locale->text('Part'),
                      );
 
-our @types = qw(text textfield number date bool select); # timestamp
+our @types = qw(text textfield number date bool select customer vendor part); # timestamp
 
 our @modules = ({ module => 'CT',       description => $locale->text('Customers and vendors')          },
+                { module => 'Contacts', description => $locale->text('Contact persons')                },
                 { module => 'IC',       description => $locale->text('Parts, services and assemblies') },
                 { module => 'Projects', description => $locale->text('Projects')                       },
                );
@@ -90,17 +94,8 @@ sub list_cvar_configs {
 
   my @configs = @{ CVar->get_configs(module => $form->{module}) };
 
-  my $previous_config;
-
   foreach my $config (@configs) {
     $config->{type_tr} = $translations{$config->{type}};
-
-    if ($previous_config) {
-      $previous_config->{next_id} = $config->{id};
-      $config->{previous_id}      = $previous_config->{id};
-    }
-
-    $previous_config = $config;
   }
 
   $form->{title} = $locale->text('List of custom variables');
@@ -219,24 +214,27 @@ sub display_cvar_config_form {
   $main::lxdebug->leave_sub();
 }
 
-sub swap_cvar_configs {
+sub update {
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
-  my %myconfig = %main::myconfig;
 
-  AM->swap_sortkeys(\%myconfig, $form, 'custom_variable_configs');
+  $main::auth->assert('config');
 
-  list_cvar_configs();
+  $form->{included_by_default} = $form->{inclusion} eq 'yes_default_on';
+  $form->{includeable}         = $form->{inclusion} ne 'no';
+
+  display_cvar_config_form();
 
   $main::lxdebug->leave_sub();
 }
 
+
 sub dispatcher {
   my $form     = $main::form;
   my $locale   = $main::locale;
 
-  foreach my $action (qw(list_cvar_configs add_cvar_config)) {
+  foreach my $action (qw(list_cvar_configs add_cvar_config update)) {
     if ($form->{"action_${action}"}) {
       call_sub($action);
       return;
@@ -247,3 +245,4 @@ sub dispatcher {
 }
 
 1;
+