X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_part.js;h=00bdc5dd67b47f1b6a55d9ed9aaa52ed4af5572b;hb=a3fbb2f841cb533264f1b3c839f7ded19cdeca6c;hp=61280fd93334add53a6aeed130a6f0ef580cb09d;hpb=c2d1e374b4f8a2b4802ea6348539da7ec10a227a;p=kivitendo-erp.git diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js index 61280fd93..00bdc5dd6 100644 --- a/js/autocomplete_part.js +++ b/js/autocomplete_part.js @@ -18,14 +18,10 @@ namespace('kivi', function(k){ var last_dummy = $dummy.val(); var open_dialog = function(){ open_jqm_window({ - url: 'controller.pl', - data: { - action: 'Part/part_picker_search', + url: 'controller.pl?action=Part/part_picker_search', + data: $.extend({ real_id: real_id, - 'filter.all:substr::ilike': function(){ return $dummy.val() }, - 'filter.type': function(){ return $type.val() }, - 'column': function(){ return $column.val() }, - }, + }, ajax_data($dummy.val())), id: 'part_selection', }); return true; @@ -33,11 +29,11 @@ namespace('kivi', function(k){ function ajax_data(term) { return { - term: term, - type: function() { return $type.val() }, + 'filter.all:substr::ilike': term, + 'filter.type': function() { return $type.val() }, + 'filter.obsolete': 0, column: function() { return $column.val()===undefined ? '' : $column.val() }, current: function() { return $real.val() }, - obsolete: 0, } } @@ -68,12 +64,9 @@ namespace('kivi', function(k){ function update_results () { $.ajax({ url: 'controller.pl?action=Part/part_picker_result', - data: { - 'filter.all:substr::ilike': function(){ var val = $('#part_picker_filter').val(); return val === undefined ? '' : val }, - 'filter.type': $type.val(), - 'column': $column.val(), - 'real_id': $real.val, - }, + data: $.extend({ + 'real_id': $real.val(), + }, ajax_data(function(){ var val = $('#part_picker_filter').val(); return val === undefined ? '' : val })), success: function(data){ $('#part_picker_result').html(data) } }); }; @@ -115,7 +108,7 @@ namespace('kivi', function(k){ $.ajax({ url: 'controller.pl?action=Part/ajax_autocomplete', dataType: "json", - data: ajax_data($dummy.val()), + data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ), success: function (data){ if (data.length == 1) { set_item(data[0]);