Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 602a4d98

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID 602a4d98939e03b3533f5b6de426ee7f719cf2e1
  • Vorgänger ddf943f2
  • Nachfolger 4f82ce00

Auslagern von Hersteller/Modell-Zeilen in eigene Templates. Hersteller/Modell auch wieder für Waren aktiviert, nicht nur für Erzeugnisse. Fix für Bug 843.

Unterschiede anzeigen:

bin/mozilla/ic.pl
1523 1523
    . $locale->text('Update') . qq|">
1524 1524
  |;
1525 1525

  
1526
  unless ($form->{item} eq "service") {
1527
    print qq|
1528
      <input type=hidden name=makemodel_rows value=$form->{makemodel_rows}>
1529
    |;
1530
  }
1526
####### moved into makemodel_row #############
1527
#  unless ($form->{item} eq "service") {
1528
#    print qq|
1529
#      <input type=hidden name=makemodel_rows value=$form->{makemodel_rows}>
1530
#    |;
1531
#  }
1531 1532

  
1532 1533
  print qq|
1533 1534
     <input type=hidden name=price_rows value=$form->{price_rows}>|;
......
1594 1595
  $lxdebug->enter_sub();
1595 1596
  my ($numrows) = @_;
1596 1597
  
1597
  print qq|
1598
  <tr>
1599
    <td>
1600
      <table width=100%>
1601
	<tr>
1602
	  <th class="listheading">| . $locale->text('Make') . qq|</th>
1603
	  <th class="listheading">| . $locale->text('Model') . qq|</th>
1604
	</tr>
1605
|;
1606

  
1607
  for my $i (1 .. $numrows) {
1608
    $form->{"make_$i"}  =~ s/\"/&quot;/g;
1609
    $form->{"model_$i"} =~ s/\"/&quot;/g;
1610
    print qq|
1611
	<tr>
1612
	  <td width=50%><input name="make_$i" size=30 value="$form->{"make_$i"}"></td>
1613
	  <td width=50%><input name="model_$i" size=30 value="$form->{"model_$i"}"></td>
1614
	</tr>
1615
|;
1616
  }
1617

  
1618
  print qq|
1619
      </table>
1620
    </td>
1621
  </tr>
1622
|;
1598
  my @mm_data = grep { $_->{make} ne '' || $_->{model} ne '' } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 1 .. $numrows;
1599
  print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 });
1623 1600

  
1624 1601
  $lxdebug->leave_sub();
1625 1602
}
bin/mozilla/invoice_io.pl
661 661

  
662 662
    &{$subroutine}($numrows);
663 663

  
664
    $numrows    = 0;
664
    $numrows    = ++$form->{makemodel_rows};
665
    $subroutine = "makemodel_row";
665 666
  }
666 667
  if ($form->{item} eq 'assembly') {
667 668
    $numrows    = $form->{price_rows};
templates/webpages/ic/makemodel_de.html
1
[%- USE HTML %]
2
[%- USE LxERP %]
3
  <tr>
4
    <td>
5
      <table width=100%>
6
        <tr>
7
          <th class="listheading">Hersteller</th>
8
          <th class="listheading">Modell</th>
9
        </tr>
10
      [%- FOREACH row = MM_DATA %]
11
        <tr>
12
          <td width=50%><input name="make_[% loop.count %]" size=30 value="[% HTML.escape(row.make) %]"></td>
13
          <td width=50%><input name="model_[% loop.count %]" size=30 value="[% HTML.escape(row.model) %]"></td>
14
        </tr>
15
      [%- END %]
16
      </table>
17
    </td>
18
  </tr>
19
  <input type=hidden name=makemodel_rows value=[% mm_rows %]>
templates/webpages/ic/makemodel_master.html
1
[%- USE HTML %]
2
[%- USE LxERP %]
3
  <tr>
4
    <td>
5
      <table width=100%>
6
        <tr>
7
          <th class="listheading"><translate>Make</translate></th>
8
          <th class="listheading"><translate>Model</translate></th>
9
        </tr>
10
      [%- FOREACH row = MM_DATA %]
11
        <tr>
12
          <td width=50%><input name="make_[% loop.count %]" size=30 value="[% HTML.escape(row.make) %]"></td>
13
          <td width=50%><input name="model_[% loop.count %]" size=30 value="[% HTML.escape(row.model) %]"></td>
14
        </tr>
15
      [%- END %]
16
      </table>
17
    </td>
18
  </tr>
19
  <input type=hidden name=makemodel_rows value=[% mm_rows %]>

Auch abrufbar als: Unified diff