Benutzerdef. Variablen in Belegen als Tabelle rendern ...

falsches Tabellen-Layout bei nicht editierbaren Variablen korrigiert.

Zu commit 25b855157fa65535683b458c1ca2dd0c3636b788
Benutzerdef. Variablen in Belegen als Tabelle rendern ...

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index f3f1945..4a5a4cd 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1879,9 +1879,11 @@ sub _render_custom_variables_inputs {
       }
     }
 
+    my $hide_non_editable = 1;
+
     my $show = 0;
     my $description = '';
-    if (($cvar->{flag_editable} && $cvar->{valid}) && !$partsgroup_filtered) {
+    if (( ($cvar->{flag_editable} || !$hide_non_editable) && $cvar->{valid}) && !$partsgroup_filtered) {
       $num_visible_cvars++;
       $description = $cvar->{description} . ' ';
       $show = 1;
@@ -1894,7 +1896,7 @@ sub _render_custom_variables_inputs {
       description    => $description,
       cvar           => 1,
       render_options => {
-         hide_non_editable => 1,
+         hide_non_editable => $hide_non_editable,
          var               => $cvar,
          name_prefix       => 'ic_',
          name_postfix      => "_$params{row}",

diff --git a/templates/webpages/oe/sales_order.html b/templates/webpages/oe/sales_order.html
index f0fecb6..f8db6ba 100644 (file)
--- a/templates/webpages/oe/sales_order.html
+++ b/templates/webpages/oe/sales_order.html
@@ -36,16 +36,20 @@
      </tr>
      <tr class="listrow[% loop.count % 2 %]" id="row2.[% loop.count %]" [% UNLESS show_details %]style="display:none;"[% END %]>
       <td colspan="[% row.colspan %]">
+
+ [%# render all row2 entries except cvars  %]
  [%- FOREACH row2 = row.ROW2 %]
    [%- IF !row2.cvar %]
      [% row2.value %]
    [%- END %]
  [%- END %]
 
+ [%# process editable cvars  %]
  <table class='row2-cvars-table'>
    <tr>
    [%- FOREACH row2 = row.ROW2 %]
-     [%- IF row2.cvar && row2.render_options.valid && !row2.render_options.partsgroup_filtered %]
+     [%- SET show = ((row2.render_options.var.flag_editable || !row2.render_options.hide_non_editable ) && row2.render_options.valid && !row2.render_options.partsgroup_filtered) %]
+     [%- IF row2.cvar && show %]
        [%- IF row2.line_break %]
          </tr><tr>
        [%- END %]
@@ -60,6 +64,14 @@
    </tr>
  </table>
 
+ [%# process non editable cvars extra to not disturb the table layout (this will be hidden inputs) %]
+ [%- FOREACH row2 = row.ROW2 %]
+   [%- SET hide = (!row2.render_options.var.flag_editable && row2.render_options.hide_non_editable) %]
+   [%- IF row2.cvar && hide %]
+     [% PROCESS cvar_inputs cvar = row2.render_options %]
+   [%- END %]
+ [%- END %]
+
       </td>
      </tr>
 [%- END %]