Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 43a1ccc8

Von Bernd Bleßmann vor mehr als 9 Jahren hinzugefügt

  • ID 43a1ccc8ea1c5dd209ecc24d7ebc68af7aec7500
  • Vorgänger 7eaf45a5
  • Nachfolger 22cf5fb6

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 ...

Unterschiede anzeigen:

bin/mozilla/io.pl
1879 1879
      }
1880 1880
    }
1881 1881

  
1882
    my $hide_non_editable = 1;
1883

  
1882 1884
    my $show = 0;
1883 1885
    my $description = '';
1884
    if (($cvar->{flag_editable} && $cvar->{valid}) && !$partsgroup_filtered) {
1886
    if (( ($cvar->{flag_editable} || !$hide_non_editable) && $cvar->{valid}) && !$partsgroup_filtered) {
1885 1887
      $num_visible_cvars++;
1886 1888
      $description = $cvar->{description} . ' ';
1887 1889
      $show = 1;
......
1894 1896
      description    => $description,
1895 1897
      cvar           => 1,
1896 1898
      render_options => {
1897
         hide_non_editable => 1,
1899
         hide_non_editable => $hide_non_editable,
1898 1900
         var               => $cvar,
1899 1901
         name_prefix       => 'ic_',
1900 1902
         name_postfix      => "_$params{row}",
templates/webpages/oe/sales_order.html
36 36
     </tr>
37 37
     <tr class="listrow[% loop.count % 2 %]" id="row2.[% loop.count %]" [% UNLESS show_details %]style="display:none;"[% END %]>
38 38
      <td colspan="[% row.colspan %]">
39

  
40
 [%# render all row2 entries except cvars  %]
39 41
 [%- FOREACH row2 = row.ROW2 %]
40 42
   [%- IF !row2.cvar %]
41 43
     [% row2.value %]
42 44
   [%- END %]
43 45
 [%- END %]
44 46

  
47
 [%# process editable cvars  %]
45 48
 <table class='row2-cvars-table'>
46 49
   <tr>
47 50
   [%- FOREACH row2 = row.ROW2 %]
48
     [%- IF row2.cvar && row2.render_options.valid && !row2.render_options.partsgroup_filtered %]
51
     [%- SET show = ((row2.render_options.var.flag_editable || !row2.render_options.hide_non_editable ) && row2.render_options.valid && !row2.render_options.partsgroup_filtered) %]
52
     [%- IF row2.cvar && show %]
49 53
       [%- IF row2.line_break %]
50 54
         </tr><tr>
51 55
       [%- END %]
......
60 64
   </tr>
61 65
 </table>
62 66

  
67
 [%# process non editable cvars extra to not disturb the table layout (this will be hidden inputs) %]
68
 [%- FOREACH row2 = row.ROW2 %]
69
   [%- SET hide = (!row2.render_options.var.flag_editable && row2.render_options.hide_non_editable) %]
70
   [%- IF row2.cvar && hide %]
71
     [% PROCESS cvar_inputs cvar = row2.render_options %]
72
   [%- END %]
73
 [%- END %]
74

  
63 75
      </td>
64 76
     </tr>
65 77
[%- END %]

Auch abrufbar als: Unified diff