From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 8 Jan 2014 11:18:47 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~22^2~16
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8cd51273a08f185176122c55c9b6e3682495e824;hp=13df1e06bae9bab2067e97435afe3f8d7e616843;p=kivitendo-erp.git

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm
index 23e5228ad..e47b06e87 100644
--- a/SL/Controller/Project.pm
+++ b/SL/Controller/Project.pm
@@ -126,6 +126,13 @@ sub display_form {
   $params{ALL_CUSTOMERS}     = SL::DB::Manager::Customer->get_all_sorted(where => [ or => [ obsolete => 0, obsolete => undef, id => $self->project->customer_id ]]);
   $params{ALL_PROJECT_TYPES} = SL::DB::Manager::ProjectType->get_all_sorted;
   $params{CUSTOM_VARIABLES}  = CVar->get_custom_variables(module => 'Projects', trans_id => $self->project->id);
+
+  if ($params{keep_cvars}) {
+    for my $cvar (@{ $params{CUSTOM_VARIABLES} }) {
+      $cvar->{value} = $::form->{"cvar_$cvar->{name}"} if $::form->{"cvar_$cvar->{name}"};
+    }
+  }
+
   CVar->render_inputs(variables => $params{CUSTOM_VARIABLES}) if @{ $params{CUSTOM_VARIABLES} };
 
   $self->render('project/form', %params);
@@ -144,7 +151,8 @@ sub create_or_update {
   if (@errors) {
     flash('error', @errors);
     $self->display_form(title    => $is_new ? $::locale->text('Create a new project') : $::locale->text('Edit project'),
-                        callback => $::form->{callback});
+                        callback => $::form->{callback},
+                        keep_cvars => 1);
     return;
   }