projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 943901c)
API-Anpassung für $form->show_generic_error(): Man kann einen JavaScript-"Zurück...
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 18 Jan 2008 12:52:02 +0000 (12:52 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 18 Jan 2008 12:52:02 +0000 (12:52 +0000)
SL/Form.pm patch | blob | history
templates/webpages/generic/error_de.html patch | blob | history
templates/webpages/generic/error_master.html patch | blob | history

diff --git a/SL/Form.pm b/SL/Form.pm
index 4c630f1..db73725 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -772,23 +772,26 @@ sub parse_html_template {
 }
 
 sub show_generic_error {
-  my ($self, $error, $title, $action) = @_;
+  my ($self, $error, %params) = @_;
 
   my $add_params = {
-    'title_error' => $title,
+    'title_error' => $params{title},
     'label_error' => $error,
   };
 
-  my @vars;
-  if ($action) {
-    map({ delete($self->{$_}); } qw(action));
-    map({ push(@vars, { "name" => $_, "value" => $self->{$_} })
-            if (!ref($self->{$_})); }
-        keys(%{$self}));
-    $add_params->{"SHOW_BUTTON"} = 1;
-    $add_params->{"BUTTON_LABEL"} = $action;
+  if ($params{action}) {
+    my @vars;
+
+    map { delete($self->{$_}); } qw(action);
+    map { push @vars, { "name" => $_, "value" => $self->{$_} } if (!ref($self->{$_})); } keys %{ $self };
+
+    $add_params->{SHOW_BUTTON}  = 1;
+    $add_params->{BUTTON_LABEL} = $params{label} || $params{action};
+    $add_params->{VARIABLES}    = \@vars;
+
+  } elsif ($params{back_button}) {
+    $add_params->{SHOW_BACK_BUTTON} = 1;
   }
-  $add_params->{"VARIABLES"} = \@vars;
 
   $self->{title} = $title if ($title);
 
diff --git a/templates/webpages/generic/error_de.html b/templates/webpages/generic/error_de.html
index 9a02960..f95bb3a 100644 (file)
--- a/templates/webpages/generic/error_de.html
+++ b/templates/webpages/generic/error_de.html
@@ -1,12 +1,32 @@
 [% USE HTML %]<body>
- <table width="100%">
-  <tr>
-   <th class="listtop">[% IF title_error %][% title_error %][% ELSE %]Fehler![% END %]</th>
-  </tr>
-  <tr height="5"></tr>
-
-  <tr><td>[% label_error %]</td></tr>
- </table>
+
+ <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]Fehler![% END %]</div>
+
+ <p>[% label_error %]</p>
+
+ [%- IF SHOW_BACK_BUTTON %]
+ <form>
+  <p>
+   <input type="button" onclick="history.back()" value="Zurück">
+  </p>
+ </form>
+
+ [%- ELSIF SHOW_BUTTON %]
+
+ <form action="[% HTML.escape(script) %]" method="post">
+
+  [%- FOREACH var = VARIABLES %]
+  <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
+
+  <p>
+   <input type="submit" value="[% BUTTON_LABEL %]">
+  </p>
+ </form>
+
+ [%- END %]
 
 </body>
 </html>
diff --git a/templates/webpages/generic/error_master.html b/templates/webpages/generic/error_master.html
index 97e4da4..5ca71e2 100644 (file)
--- a/templates/webpages/generic/error_master.html
+++ b/templates/webpages/generic/error_master.html
@@ -1,12 +1,32 @@
 [% USE HTML %]<body>
- <table width="100%">
-  <tr>
-   <th class="listtop">[% IF title_error %][% title_error %][% ELSE %]<translate>Error!</translate>[% END %]</th>
-  </tr>
-  <tr height="5"></tr>
-
-  <tr><td>[% label_error %]</td></tr>
- </table>
+
+ <div class="listtop">[% IF title_error %][% title_error %][% ELSE %]<translate>Error!</translate>[% END %]</div>
+
+ <p>[% label_error %]</p>
+
+ [%- IF SHOW_BACK_BUTTON %]
+ <form>
+  <p>
+   <input type="button" onclick="history.back()" value="<translate>Back</translate>">
+  </p>
+ </form>
+
+ [%- ELSIF SHOW_BUTTON %]
+
+ <form action="[% HTML.escape(script) %]" method="post">
+
+  [%- FOREACH var = VARIABLES %]
+  <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+  [%- END %]
+
+  <input type="hidden" name="action" value="[% HTML.escape(action) %]">
+
+  <p>
+   <input type="submit" value="[% BUTTON_LABEL %]">
+  </p>
+ </form>
+
+ [%- END %]
 
 </body>
 </html>
Unnamed repository; edit this file 'description' to name the repository.