Belegvorlagen: Form-Parameter beim Laden über Request vorbelegen können

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 9018dd9053b4706d358ea3c8d74eaf927db38251..b45cb99c5a919e4a81ea26966ada05af849506a9 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -103,6 +103,7 @@ sub load_record_template {
   $template->substitute_variables;
 
   # Clean the current $::form before rebuilding it from the template.
   $template->substitute_variables;
 
   # Clean the current $::form before rebuilding it from the template.

+  my $form_defaults = delete $::form->{form_defaults};

   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
 
   # Fill $::form from the template.
   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
 
   # Fill $::form from the template.


@@ -150,6 +151,8 @@ sub load_record_template {
     $::form->{"project_id_${row}"}                  = $item->project_id;
   }
 
     $::form->{"project_id_${row}"}                  = $item->project_id;
   }
 

+  $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
+

   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
   update(
   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
   update(

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 1fd81c3d1ae6cef63f64781dede657a467096be8..ecd357eeb13bffb92c5af096004f00011c937240 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -101,6 +101,7 @@ sub load_record_template {
   $template->substitute_variables;
 
   # Clean the current $::form before rebuilding it from the template.
   $template->substitute_variables;
 
   # Clean the current $::form before rebuilding it from the template.

+  my $form_defaults = delete $::form->{form_defaults};

   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
 
   # Fill $::form from the template.
   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
 
   # Fill $::form from the template.


@@ -148,6 +149,8 @@ sub load_record_template {
     $::form->{"project_id_${row}"}                  = $item->project_id;
   }
 
     $::form->{"project_id_${row}"}                  = $item->project_id;
   }
 

+  $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
+

   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
   update(
   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
   update(

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index c2a2f02d57d07abc42d5892665d909d73e6c3f22..14a58b4a686e342a98514b754f6f33c256ab6e4f 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -96,6 +96,7 @@ sub load_record_template {
   $template->substitute_variables;
 
   # Clean the current $::form before rebuilding it from the template.
   $template->substitute_variables;
 
   # Clean the current $::form before rebuilding it from the template.

+  my $form_defaults = delete $::form->{form_defaults};

   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
 
   my $dummy_form = {};
   delete @{ $::form }{ grep { !m{^(?:script|login)$}i } keys %{ $::form } };
 
   my $dummy_form = {};


@@ -138,6 +139,8 @@ sub load_record_template {
     $::form->{"${_}_${row}"}              = $item->$_ for qw(source memo project_id);
   }
 
     $::form->{"${_}_${row}"}              = $item->$_ for qw(source memo project_id);
   }
 

+  $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
+

   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
   update(
   flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
 
   update(