From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 6 Jan 2016 12:00:57 +0000 (+0100)
Subject: Auftrags-Controller: Mehrfach-Artikelauswahl: Verbesserungen
X-Git-Tag: release-3.4.1~329
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=9fff4a29dd58de6dede5665921ef7b8aa9270b98;p=kivitendo-erp.git

Auftrags-Controller: Mehrfach-Artikelauswahl: Verbesserungen

- ungültige Artikel nicht anzeigen.
- Artikel nicht mehrfach hinzufügen, wenn ausversehen mehrfach Enter gedrückt
  oder der Weiter-Knopf mehrfach angeklickt wird.
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index c980db71d..eba061c08 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -438,6 +438,9 @@ sub action_show_multi_items_dialog {
 
 sub action_multi_items_update_result {
   my $max_count = 100;
+
+  $::form->{multi_items}->{filter}->{obsolete} = 0;
+
   my $count = $_[0]->multi_items_models->count;
 
   if ($count == 0) {
diff --git a/templates/webpages/order/tabs/_multi_items_dialog.html b/templates/webpages/order/tabs/_multi_items_dialog.html
index 710c332f0..47f8f0d9f 100644
--- a/templates/webpages/order/tabs/_multi_items_dialog.html
+++ b/templates/webpages/order/tabs/_multi_items_dialog.html
@@ -18,7 +18,7 @@
 <div id='multi_items_result'></div>
 <hr>
 
-[% L.button_tag('add_multi_items()', LxERP.t8('Continue')) %]
+[% L.button_tag('add_multi_items()', LxERP.t8('Continue'), id='continue_button') %]
 <a href="#" onclick="close_multi_items_dialog();">[%- LxERP.t8("Cancel") %]</a>
 
 <script type='text/javascript'>
@@ -31,18 +31,42 @@ function update_result() {
     method: 'post',
     success: function(data){
       $('#multi_items_result').html(data);
-      $('#multi_items_result input').keydown(function(event) {
-        if(event.keyCode == 13) {
-          event.preventDefault();
-          add_multi_items();
-          return false;
-        }
-      });
+      enable_continue();
     }
   });
 }
 
+function disable_continue() {
+  // disable keydown-event and continue button to prevent
+  // impatient users to add parts multiple times
+  $('#multi_items_result input').off("keydown");
+  $('#continue_button').prop('disabled', true);
+}
+
+function enable_continue() {
+  $('#multi_items_result input').keydown(function(event) {
+    if(event.keyCode == 13) {
+      event.preventDefault();
+      add_multi_items();
+      return false;
+    }
+  });
+  $('#continue_button').prop('disabled', false);
+}
+
 function add_multi_items() {
+  // rows at all
+  var n_rows = $('.multi_items_qty').length;
+  if ( n_rows == 0) { return; }
+
+  // filled rows
+  n_rows = $('.multi_items_qty').filter(function() {
+    return $(this).val().length > 0;
+  }).length;
+  if ( n_rows == 0) { return; }
+
+  disable_continue();
+
   var data = $('#[%- FORM.callback_data_id %]').serializeArray();
   data = data.concat($('#multi_items_form').serializeArray());
   data.push({ name: 'action', value: '[%- FORM.callback %]' });