X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.Part.js;h=eee498e3be57edc6fa25245f4b93311af9074a3d;hb=f81dcf3479f34b5299491ea5df476ddf977379b9;hp=595db8c7400a598bfca0ef4b93ed1fe0b3bfcc1d;hpb=120225aa6c3c1a80f45613cdc969c2bf17bb5a03;p=kivitendo-erp.git diff --git a/js/kivi.Part.js b/js/kivi.Part.js index 595db8c74..eee498e3b 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,7 +168,7 @@ 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' }, @@ -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,7 +274,7 @@ 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: { @@ -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(); } @@ -425,6 +425,7 @@ namespace('kivi.Part', function(ns) { } if (event.which == KEY.ENTER) { self.handle_changed_text({ + match_none: self.o.action.commit_none, match_one: self.o.action.commit_one, match_many: self.o.action.commit_many });