From 6d6d4044b1caa0e4f7c9de61e3a0bc9dd691a035 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= <bernd@kivitendo-premium.de>
Date: Fri, 15 Jan 2016 18:11:26 +0100
Subject: [PATCH] =?utf8?q?PrintOptions=5FHelper:=20Angabe=20eines=20prefix?=
 =?utf8?q?=20erm=C3=B6glichen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Helper/PrintOptions.pm                     | 5 +++--
 templates/webpages/generic/print_options.html | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/SL/Helper/PrintOptions.pm b/SL/Helper/PrintOptions.pm
index 430425a29..230e72dca 100644
--- a/SL/Helper/PrintOptions.pm
+++ b/SL/Helper/PrintOptions.pm
@@ -22,6 +22,8 @@ sub get_print_options {
   my $locale   = $params{locale}   || $::locale;
   my $options  = $params{options};
 
+  my $prefix = $options->{dialog_name_prefix} || '';
+
   # names 3 parameters and returns a hashref, for use in templates
   sub opthash { +{ value => shift, selected => shift, oname => shift } }
   my (@FORMNAME, @LANGUAGE_ID, @FORMAT, @SENDMODE, @MEDIA, @PRINTER_ID, @SELECTS) = ();
@@ -122,6 +124,7 @@ sub get_print_options {
     );
 
   my %template_vars = (
+    name_prefix          => $prefix || '',
     display_copies       => scalar @{ $form->{printers} || [] } && $::lx_office_conf{print_templates}->{latex} && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),
     display_groupitems   => !$dont_display_groupitems{$form->{type}},
@@ -132,6 +135,4 @@ sub get_print_options {
   return $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 }
 
-
 1;
-
diff --git a/templates/webpages/generic/print_options.html b/templates/webpages/generic/print_options.html
index f8ee3efd3..95de1f762 100644
--- a/templates/webpages/generic/print_options.html
+++ b/templates/webpages/generic/print_options.html
@@ -9,7 +9,7 @@
      <td>
       [%- FOREACH row = SELECTS %]
       [%- IF row.show %]
-      <select name="[% row.sname %]">
+      <select name="[%- name_prefix %][%- row.sname %]">
        [%- FOREACH data = row.DATA %]
        <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
        [%- END %]
@@ -18,15 +18,15 @@
       [%- END %]
      </td>
      [%- IF display_copies %]
-     <td>[% 'Copies' | $T8 %] <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     <td>[% 'Copies' | $T8 %] <input name="[%- name_prefix %]copies" size="2" value="[% HTML.escape(copies) %]"></td>
      [%- END %]
      [%- IF display_groupitems %]
      <td>[% 'Group Items' | $T8 %]</td>
-     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
+     <td><input name="[%- name_prefix %]groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
      [%- END %]
      [%- IF display_remove_draft %]
      <td>[% 'Remove Draft' | $T8 %]</td>
-     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
+     <td><input name="[%- name_prefix %]remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
      [%- END %]
     </tr>
    </table>
-- 
2.20.1