Weightunit im Standarddialog mit Dropdownbox auswählen.

Fix für Bug 1118.

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 2394118405ff9d1d6545537b7bb937c625fc1bba..684632679f8d34cd0d22d0ce5d63c92a587e67a3 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2397,6 +2397,7 @@ sub edit_defaults {
 
   # get defaults for account numbers and last numbers
   AM->defaultaccounts(\%myconfig, \%$form);
 
   # get defaults for account numbers and last numbers
   AM->defaultaccounts(\%myconfig, \%$form);

+  $form->{ALL_UNITS} = AM->convertible_units(AM->retrieve_all_units(), 'g');

 
   map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 
 
   map { $form->{"defaults_${_}"} = $form->{defaults}->{$_} } keys %{ $form->{defaults} };
 

diff --git a/templates/webpages/am/edit_defaults_de.html b/templates/webpages/am/edit_defaults_de.html
index ffd534d5b89d5e691f95f0081fdea40242510876..c4298c7a886bc95e3f3b96faa095f7ba4176a40c 100644 (file)
--- a/templates/webpages/am/edit_defaults_de.html
+++ b/templates/webpages/am/edit_defaults_de.html
@@ -137,7 +137,17 @@
 
     <tr>
      <th align="right">Gewichtseinheit</th>
 
     <tr>
      <th align="right">Gewichtseinheit</th>

-     <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td>
+ <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
+     <td>
+      [%- INCLUDE 'generic/multibox.html'
+           name          = 'weightunit',
+           default       = defaults_weightunit,
+           style         = 'size:20; maxength:5',
+           DATA          = ALL_UNITS,
+           id_key        = 'name',
+           label_key     = 'name',
+           -%]
+      </td>

     </tr>
 
    </table>
     </tr>
 
    </table>

diff --git a/templates/webpages/am/edit_defaults_master.html b/templates/webpages/am/edit_defaults_master.html
index 47693c6545b7b75d1a39d29a49473145dda0f386..f73ea15a3d518f0c96bcf7e672de3c07fb343d25 100644 (file)
--- a/templates/webpages/am/edit_defaults_master.html
+++ b/templates/webpages/am/edit_defaults_master.html
@@ -137,7 +137,17 @@
 
     <tr>
      <th align="right"><translate>Weight unit</translate></th>
 
     <tr>
      <th align="right"><translate>Weight unit</translate></th>

-     <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td>
+ <!--    <td colspan="3"><input name="weightunit" size="20" maxlength="5" value="[% HTML.escape(defaults_weightunit) %]"></td> -->
+     <td>
+      [%- INCLUDE 'generic/multibox.html'
+           name          = 'weightunit',
+           default       = defaults_weightunit,
+           style         = 'size:20; maxength:5',
+           DATA          = ALL_UNITS,
+           id_key        = 'name',
+           label_key     = 'name',
+           -%]
+      </td>

     </tr>
 
    </table>
     </tr>
 
    </table>