kivi.Validator: In DO Suche und Normaler Maske als check registriert

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index f65c6221692c3533e99bc96b07c448a501de1efa..af00d34e45024997754dea90d72bcc3144cc9fc0 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -247,6 +247,7 @@ sub setup_do_action_bar {
         [ t8('Update'),
           submit    => [ '#form', { action => "update" } ],
           id        => 'update_button',
         [ t8('Update'),
           submit    => [ '#form', { action => "update" } ],
           id        => 'update_button',

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

           accesskey => 'enter',
         ],
 
           accesskey => 'enter',
         ],
 


@@ -254,19 +255,19 @@ sub setup_do_action_bar {
         action => [
           t8('Save'),
           submit   => [ '#form', { action => "save" } ],
         action => [
           t8('Save'),
           submit   => [ '#form', { action => "save" } ],

-          checks   => [ @req_trans_desc ],
+          checks   => [ 'kivi.validate_form' ],

           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
         ],
         action => [
           t8('Save as new'),
           submit   => [ '#form', { action => "save_as_new" } ],
           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
         ],
         action => [
           t8('Save as new'),
           submit   => [ '#form', { action => "save_as_new" } ],

-          checks   => [ @req_trans_desc ],
+          checks   => [ 'kivi.validate_form' ],

           disabled => !$::form->{id},
         ],
         action => [
           t8('Mark as closed'),
           submit   => [ '#form', { action => "mark_closed" } ],
           disabled => !$::form->{id},
         ],
         action => [
           t8('Mark as closed'),
           submit   => [ '#form', { action => "mark_closed" } ],

-          checks   => [ @req_trans_desc ],
+          checks   => [ 'kivi.validate_form' ],

           confirm  => t8('This will remove the delivery order from showing as open even if contents are not delivered. Proceed?'),
           disabled => !$::form->{id}    ? t8('This record has not been saved yet.')
                     : $::form->{closed} ? t8('This record has already been closed.')
           confirm  => t8('This will remove the delivery order from showing as open even if contents are not delivered. Proceed?'),
           disabled => !$::form->{id}    ? t8('This record has not been saved yet.')
                     : $::form->{closed} ? t8('This record has already been closed.')


@@ -289,28 +290,28 @@ sub setup_do_action_bar {
         action => [
           t8('Transfer out'),
           submit   => [ '#form', { action => "transfer_out" } ],
         action => [
           t8('Transfer out'),
           submit   => [ '#form', { action => "transfer_out" } ],

-          checks   => [ @req_trans_desc, @transfer_qty ],
+          checks   => [ 'kivi.validate_form', @transfer_qty ],

           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => $is_customer,
         ],
         action => [
           t8('Transfer out via default'),
           submit   => [ '#form', { action => "transfer_out_default" } ],
           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => $is_customer,
         ],
         action => [
           t8('Transfer out via default'),
           submit   => [ '#form', { action => "transfer_out_default" } ],

-          checks   => [ @req_trans_desc ],
+          checks   => [ 'kivi.validate_form' ],

           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => $is_customer && $::instance_conf->get_transfer_default,
         ],
         action => [
           t8('Transfer in'),
           submit   => [ '#form', { action => "transfer_in" } ],
           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => $is_customer && $::instance_conf->get_transfer_default,
         ],
         action => [
           t8('Transfer in'),
           submit   => [ '#form', { action => "transfer_in" } ],

-          checks   => [ @req_trans_desc, @transfer_qty ],
+          checks   => [ 'kivi.validate_form', @transfer_qty ],

           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => !$is_customer,
         ],
         action => [
           t8('Transfer in via default'),
           submit   => [ '#form', { action => "transfer_in_default" } ],
           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => !$is_customer,
         ],
         action => [
           t8('Transfer in via default'),
           submit   => [ '#form', { action => "transfer_in_default" } ],

-          checks   => [ @req_trans_desc ],
+          checks   => [ 'kivi.validate_form' ],

           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => !$is_customer && $::instance_conf->get_transfer_default,
         ],
           disabled => $::form->{delivered} ? t8('This record has already been delivered.') : undef,
           only_if  => !$is_customer && $::instance_conf->get_transfer_default,
         ],


@@ -330,12 +331,12 @@ sub setup_do_action_bar {
         action => [
           t8('Print'),
           call   => [ 'kivi.SalesPurchase.show_print_dialog' ],
         action => [
           t8('Print'),
           call   => [ 'kivi.SalesPurchase.show_print_dialog' ],

-          checks => [ @req_trans_desc ],
+          checks => [ 'kivi.validate_form' ],

         ],
         action => [
           t8('E Mail'),
           call   => [ 'kivi.SalesPurchase.show_email_dialog' ],
         ],
         action => [
           t8('E Mail'),
           call   => [ 'kivi.SalesPurchase.show_email_dialog' ],

-          checks => [ @req_trans_desc ],
+          checks => [ 'kivi.validate_form' ],

         ],
       ], # end of combobox "Export"
 
         ],
       ], # end of combobox "Export"
 


@@ -354,6 +355,7 @@ sub setup_do_action_bar {
       ], # end if combobox "more"
     );
   }
       ], # end if combobox "more"
     );
   }

+  $::request->layout->add_javascripts('kivi.Validator.js');

 }
 
 sub setup_do_search_action_bar {
 }
 
 sub setup_do_search_action_bar {


@@ -365,9 +367,11 @@ sub setup_do_search_action_bar {
         t8('Search'),
         submit    => [ '#form' ],
         accesskey => 'enter',
         t8('Search'),
         submit    => [ '#form' ],
         accesskey => 'enter',

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

       ],
     );
   }
       ],
     );
   }

+  $::request->layout->add_javascripts('kivi.Validator.js');

 }
 
 sub setup_do_orders_action_bar {
 }
 
 sub setup_do_orders_action_bar {

diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 62ba79f4a3c0c972cd76ea5f3f67aa71712e116b..ef87d879db333f9d1afaf2101b479c19d72bac4a 100644 (file)
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -214,7 +214,7 @@
 
        <tr>
         <th align="right">[% 'Transaction description' | $T8 %]</th>
 
        <tr>
         <th align="right">[% 'Transaction description' | $T8 %]</th>

-        <td colspan="3"><input name="transaction_description" id="transaction_description" size="35" value="[% HTML.escape(transaction_description) %]"[% RO %]></td>
+        <td colspan="3">[% L.input_tag("transaction_description", transaction_description, size=35, "data-validate"=(INSTANCE_CONF.get_require_transaction_description_ps ? 'required' : ''), readonly=delivered) %]</td>

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