Bei print_options() die Parameterübergabe umgestellt, sodass der Aufrufer das Verhalt...

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 7648dc1fd710f06c96a5807a8a3606e18339dc93..7f8f65a54a2fa52138672630e1fbd88f443e7adb 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1283,7 +1283,7 @@ sub edit_e_mail {
   print $form->parse_html_template('generic/edit_email', 
                                   { title           => $title,
                                     a_filename      => $attachment_filename,
   print $form->parse_html_template('generic/edit_email', 
                                   { title           => $title,
                                     a_filename      => $attachment_filename,

-                                    _print_options_ => print_options('inline'),
+                                    _print_options_ => print_options({ 'inline' => 1 }),

                                     HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
                                     SHOW_BCC        => $myconfig{role} eq 'admin' });
 
                                     HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
                                     SHOW_BCC        => $myconfig{role} eq 'admin' });
 


@@ -1315,7 +1315,11 @@ sub send_email {
 #
 # the inline options is untested, but intended to be used later in metatemplating
 sub print_options {
 #
 # the inline options is untested, but intended to be used later in metatemplating
 sub print_options {

-  $lxdebug->enter_sub() and my ($inline) = @_;
+  $lxdebug->enter_sub();
+
+  my ($options) = @_;
+
+  $options ||= { };

 
   # names 3 parameters and returns a hashref, for use in templates
   sub opthash { +{ value => shift, selected => shift, oname => shift } }
 
   # names 3 parameters and returns a hashref, for use in templates
   sub opthash { +{ value => shift, selected => shift, oname => shift } }


@@ -1370,7 +1374,7 @@ sub print_options {
       opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
     (scalar @{ $form->{printers} } && $latex_templates) ?
       opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,
       opthash("screen", $form->{OP}{screen}, $locale->text('Screen')),
     (scalar @{ $form->{printers} } && $latex_templates) ?
       opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef,

-    ($latex_templates) ? 
+    ($latex_templates && !$options{no_queue}) ?

       opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
         if ($form->{media} ne 'email');
 
       opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef
         if ($form->{media} ne 'email');
 


@@ -1395,16 +1399,21 @@ sub print_options {
 
   @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
 
 
   @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID);
 

+  my %dont_display_groupitems = (
+    'dunning' => 1,
+    );
+

   %template_vars = (
     display_copies       => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),
   %template_vars = (
     display_copies       => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email',
     display_remove_draft => (!$form->{id} && $form->{draft_id}),

+    display_groupitems   => !$dont_display_groupitems{$form->{type}},

     groupitems_checked   => $form->{groupitems} ? "checked" : '',
     remove_draft_checked => $form->{remove_draft} ? "checked" : ''
   );
 
   my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
     groupitems_checked   => $form->{groupitems} ? "checked" : '',
     remove_draft_checked => $form->{remove_draft} ? "checked" : ''
   );
 
   my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 

-  if ($inline) {
+  if ($options{inline}) {

     $lxdebug->leave_sub() and return $print_options;
   } else {
     print $print_options; $lxdebug->leave_sub();
     $lxdebug->leave_sub() and return $print_options;
   } else {
     print $print_options; $lxdebug->leave_sub();

diff --git a/templates/webpages/generic/print_options_de.html b/templates/webpages/generic/print_options_de.html
index 352450951bc816ac020cc24f400f1cb90851889e..1b952b927cf61a30f995538bd8f08ec532a75d84 100644 (file)
--- a/templates/webpages/generic/print_options_de.html
+++ b/templates/webpages/generic/print_options_de.html
@@ -12,8 +12,10 @@
     <TMPL_IF display_copies>
       <td>Kopien <input name=copies size=2 value=<TMPL_VAR copies>></td>
     </TMPL_IF>
     <TMPL_IF display_copies>
       <td>Kopien <input name=copies size=2 value=<TMPL_VAR copies>></td>
     </TMPL_IF>

+    <TMPL_IF display_groupitems>

       <td>Waren gruppieren</td>
       <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>
       <td>Waren gruppieren</td>
       <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>

+    </TMPL_IF>

     <TMPL_IF display_remove_draft>
       <td>Entwurf l&ouml;schen</td>
       <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>
     <TMPL_IF display_remove_draft>
       <td>Entwurf l&ouml;schen</td>
       <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>

diff --git a/templates/webpages/generic/print_options_master.html b/templates/webpages/generic/print_options_master.html
index a9fe1eecd103b413d7dca93efedebf71d175ef83..c0a37ea00dbbac4d7dd05d1c60e9863fc0b1d628 100644 (file)
--- a/templates/webpages/generic/print_options_master.html
+++ b/templates/webpages/generic/print_options_master.html
@@ -12,8 +12,10 @@
     <TMPL_IF display_copies>
       <td><translate>Copies</translate> <input name=copies size=2 value=<TMPL_VAR copies>></td>
     </TMPL_IF>
     <TMPL_IF display_copies>
       <td><translate>Copies</translate> <input name=copies size=2 value=<TMPL_VAR copies>></td>
     </TMPL_IF>

+    <TMPL_IF display_groupitems>

       <td><translate>Group Items</translate></td>
       <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>
       <td><translate>Group Items</translate></td>
       <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>

+    </TMPL_IF>

     <TMPL_IF display_remove_draft>
       <td><translate>Remove Draft</translate></td>
       <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>
     <TMPL_IF display_remove_draft>
       <td><translate>Remove Draft</translate></td>
       <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>