Warenstammdaten: EAN: Leerzeichen trimmen

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 757f1abcd27c82e1a576c35e296ad6f860f7d370..d2638fb7e53e437a0ff3d802f7a2ef4f493bdffc 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -709,7 +709,7 @@ sub add {
 
 sub _set_javascript {
   my ($self) = @_;
 
 sub _set_javascript {
   my ($self) = @_;

-  $::request->layout->use_javascript("${_}.js")  for qw(kivi.Part kivi.File kivi.PriceRule ckeditor/ckeditor ckeditor/adapters/jquery kivi.ShopPart);
+  $::request->layout->use_javascript("${_}.js")  for qw(kivi.Part kivi.File kivi.PriceRule ckeditor/ckeditor ckeditor/adapters/jquery kivi.ShopPart kivi.Validator);

   $::request->layout->add_javascripts_inline("\$(function(){kivi.PriceRule.load_price_rules_for_part(@{[ $self->part->id ]})});") if $self->part->id;
 }
 
   $::request->layout->add_javascripts_inline("\$(function(){kivi.PriceRule.load_price_rules_for_part(@{[ $self->part->id ]})});") if $self->part->id;
 }
 


@@ -1335,6 +1335,7 @@ sub _setup_form_action_bar {
           t8('Save'),
           call      => [ 'kivi.Part.save' ],
           disabled  => !$may_edit ? t8('You do not have the permissions to access this function.') : undef,
           t8('Save'),
           call      => [ 'kivi.Part.save' ],
           disabled  => !$may_edit ? t8('You do not have the permissions to access this function.') : undef,

+          checks    => ['kivi.validate_form'],

         ],
         action => [
           t8('Use as new'),
         ],
         action => [
           t8('Use as new'),

diff --git a/templates/webpages/part/_basic_data.html b/templates/webpages/part/_basic_data.html
index ba18da2661ee53e5b96c11c23564178116616523..141f4904806e1a70e9ddc925bf4668ffc084f157 100644 (file)
--- a/templates/webpages/part/_basic_data.html
+++ b/templates/webpages/part/_basic_data.html
@@ -33,7 +33,7 @@
              </tr>
              <tr>
                <th align="right">[% 'EAN-Code' | $T8 %]</th>
              </tr>
              <tr>
                <th align="right">[% 'EAN-Code' | $T8 %]</th>

-               <td>[% L.input_tag("part.ean", SELF.part.ean, size=40) %]</td>
+               <td>[% L.input_tag("part.ean", SELF.part.ean, size=40, "data-validate"="trimmed_whitespaces") %]</td>

              </tr>
              <tr>
               [%- IF SELF.all_partsgroups.size %]
              </tr>
              <tr>
               [%- IF SELF.all_partsgroups.size %]