Maske 'Artikel nicht in DB; neu anlegen?' auch funktionierenden 'Zurück'-Button anzeigen

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 2b35c70878e29324f4ba76bdc4059a63e15064d1..215ec16ab1fdfdfbe33a5ca1b791a3e6209c3a52 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -32,7 +32,7 @@
 #======================================================================
 
 use POSIX qw(strftime);
 #======================================================================
 
 use POSIX qw(strftime);

-use List::Util qw(max);
+use List::Util qw(first max);

 use List::MoreUtils qw(any);
 
 use SL::AM;
 use List::MoreUtils qw(any);
 
 use SL::AM;


@@ -117,7 +117,7 @@ sub search {
 
   $form->get_lists('partsgroup'    => 'ALL_PARTSGROUPS');
   print $form->parse_html_template('ic/search', { %is_xyz,
 
   $form->get_lists('partsgroup'    => 'ALL_PARTSGROUPS');
   print $form->parse_html_template('ic/search', { %is_xyz,

-                                                  dateformat => $myconfig{dateformat}, 
+                                                  dateformat => $myconfig{dateformat},

                                                   limit => $myconfig{vclimit}, });
 
   $lxdebug->leave_sub();
                                                   limit => $myconfig{vclimit}, });
 
   $lxdebug->leave_sub();


@@ -2042,4 +2042,22 @@ sub ajax_autocomplete {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub back_to_record {
+  _check_io_auth();
+
+  $::auth->restore_form_from_session($::form->{previousform}, clobber => 1);
+  $::form->{rowcount}--;
+  $::form->{action}   = 'display_form';
+  $::form->{callback} = $::form->{script} . '?' . join('&', map { $::form->escape($_) . '=' . $::form->escape($::form->{$_}) } sort keys %{ $::form });
+  $::form->redirect;
+}
+

 sub continue { call_sub($form->{"nextsub"}); }
 sub continue { call_sub($form->{"nextsub"}); }

+
+sub dispatcher {
+  my $action = first { $::form->{"action_${_}"} } qw(add back_to_record);
+  $::form->error($::locale->text('No action defined.')) unless $action;
+
+  $::form->{dispatched_action} = $action;
+  call_sub($action);
+}

diff --git a/templates/webpages/generic/new_item.html b/templates/webpages/generic/new_item.html
index 1d3104a6d44d2ccc09968ed8b88e1469fecddb1a..3d6fbe08fe45499cf99d3579387e18b9e0fa07eb 100644 (file)
--- a/templates/webpages/generic/new_item.html
+++ b/templates/webpages/generic/new_item.html
@@ -3,7 +3,6 @@
 
     <h4 class="error">[% 'Item not on file!' | $T8 %]
 
 
     <h4 class="error">[% 'Item not on file!' | $T8 %]
 

-

     <p>[% 'What type of item is this?' | $T8 %]</h4>
 
     <form method="post" action="ic.pl">
     <p>[% 'What type of item is this?' | $T8 %]</h4>
 
     <form method="post" action="ic.pl">


@@ -18,8 +17,9 @@
       <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
       [%- END %]
 
       <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
       [%- END %]
 

-      <input type="hidden" name="nextsub" value="add">
-      <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
+      <input type="hidden" name="action" value="dispatcher">
+      <input class="submit" type="submit" name="action_add" value="[% 'Continue' | $T8 %]">
+      <input class="submit" type="submit" name="action_back_to_record" value="[% 'Back' | $T8 %]">

     </form>
 
   </body>
     </form>
 
   </body>