X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=9280fcf9c5734ea7066c511c5e662c934554ba24;hb=faceb8b211c444e20d81ca05e91b33406e281491;hp=e8fcd28a6bc6d750f5993cb31dc513584a9a4c54;hpb=dbd35a966c8be73011ee84643b588e8ccc6f892f;p=kivitendo-erp.git

diff --git a/js/kivi.Part.js b/js/kivi.Part.js
index e8fcd28a6..9280fcf9c 100644
--- a/js/kivi.Part.js
+++ b/js/kivi.Part.js
@@ -154,7 +154,7 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_assortment_item = function() {
-    if ($('#add_assortment_item_id').val() === '') return;
+    if ($('#assortment_picker').val() === '') return;
 
     $('#row_table_id thead a img').remove();
 
@@ -168,12 +168,12 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_assembly_item = function() {
-    if ($('#add_assembly_item_id').val() === '') return;
+    if ($('#assembly_picker').val() === '') return;
 
     var data = $('#assembly :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_assembly_item' },
               { name: 'part.id', value: $("#part_id").val()     },
-              { name: 'part.part_type', value: 'assortment'     });
+              { name: 'part.part_type', value: 'assembly'       });
     $('#assembly_picker').data('part_picker').clear();
 
     $.post("controller.pl", data, kivi.eval_json_result);
@@ -194,7 +194,7 @@ namespace('kivi.Part', function(ns) {
   ns.close_picker_dialogs = function() {
     $('.part_autocomplete').each(function(_, e) {
       var picker = $(e).data('part_picker');
-      if (picker) picker.close_dialog();
+      if (picker && picker.dialog) picker.close_dialog();
     });
   }
 
@@ -241,7 +241,7 @@ namespace('kivi.Part', function(ns) {
   };
 
   ns.add_makemodel_row = function() {
-    if ($('#add_makemodelid').val() === '') return;
+    if ($('#add_makemodel').val() === '') return;
 
     var data = $('#makemodel_table :input').serializeArray();
     data.push({ name: 'action', value: 'Part/add_makemodel_row' });
@@ -274,13 +274,13 @@ namespace('kivi.Part', function(ns) {
 
   ns.Picker = function($real, options) {
     var self = this;
-    this.o = $.extend({
+    this.o = $.extend(true, {
       limit: 20,
       delay: 50,
       action: {
-        on_enter_match_none: function(){ },
-        on_enter_match_one:  function(){ $('#update_button').click(); },
-        on_enter_match_many: function(){ self.open_dialog(); }
+        commit_none: function(){ },
+        commit_one:  function(){ $('#update_button').click(); },
+        commit_many: function(){ self.open_dialog(); }
       }
     }, $real.data('part-picker-data'), options);
     this.$real              = $real;
@@ -388,7 +388,7 @@ namespace('kivi.Part', function(ns) {
             if (callbacks && callbacks.match_many) self.run_action(callbacks.match_many, [ data ]);
           } else {
             self.state = self.STATES.UNDEFINED;
-            if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none);
+            if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none, [ self, self.$dummy.val() ]);
           }
           self.annotate_state();
         }
@@ -414,8 +414,8 @@ namespace('kivi.Part', function(ns) {
           self.set_item({});
           return true;
         } else if (self.state == self.STATES.PICKED) {
-          if (self.o.action.on_enter_match_one) {
-            self.run_action(self.o.action.on_enter_match_one);
+          if (self.o.action.commit_one) {
+            self.run_action(self.o.action.commit_one);
           }
           return true;
         }
@@ -424,9 +424,11 @@ namespace('kivi.Part', function(ns) {
           self.handle_changed_text();
         }
         if (event.which == KEY.ENTER) {
+          event.preventDefault();
           self.handle_changed_text({
-            match_one:  self.o.action.on_enter_match_one,
-            match_many: self.o.action.on_enter_match_many
+            match_none: self.o.action.commit_none,
+            match_one:  self.o.action.commit_one,
+            match_many: self.o.action.commit_many
           });
           return false;
         }