PartPicker: Im Popup dem letzten Suchstring übernehmen

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index d9bf8dbbba48f494dce4ba44cc29690f1630ce1c..fd1bda87c32320c60bd508d8c81a9a43908ec7c5 100644 (file)
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -31,6 +31,7 @@ namespace('kivi', function(k){
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();

+    var last_unverified_dummy = $dummy.val();

     var timer;
 
     function open_dialog () {
     var timer;
 
     function open_dialog () {


@@ -38,7 +39,7 @@ namespace('kivi', function(k){
         url: 'controller.pl?action=Part/part_picker_search',
         data: $.extend({
           real_id: real_id,
         url: 'controller.pl?action=Part/part_picker_search',
         data: $.extend({
           real_id: real_id,

-        }, ajax_data($dummy.val())),
+        }, ajax_data(last_unverified_dummy)),

         id: 'part_selection',
         dialog: {
           title: k.t8('Part picker'),
         id: 'part_selection',
         dialog: {
           title: k.t8('Part picker'),


@@ -102,6 +103,7 @@ namespace('kivi', function(k){
       else if (state == STATES.UNDEFINED && $dummy.val() == '')
         set_item({})
       else
       else if (state == STATES.UNDEFINED && $dummy.val() == '')
         set_item({})
       else

+        last_unverified_dummy = $dummy.val();

         set_item({ id: last_real, name: last_dummy })
     }
 
         set_item({ id: last_real, name: last_dummy })
     }
 

diff --git a/templates/webpages/part/part_picker_search.html b/templates/webpages/part/part_picker_search.html
index 96ddeb26ff6adb9fadbc0a5a8298fd4d9e8b29c5..4d625c7aebfdbb83a93cd49830d60ed12ec84a02 100644 (file)
--- a/templates/webpages/part/part_picker_search.html
+++ b/templates/webpages/part/part_picker_search.html
@@ -5,7 +5,7 @@
 
 <div style='overflow:hidden'>
 
 
 <div style='overflow:hidden'>
 

-[% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', SELF.filter.all_substr__ilike, class='part_picker_filter') %]
+[% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', SELF.filter.all_substr_multi__ilike, class='part_picker_filter') %]

 [% L.hidden_tag('part_picker_real_id', FORM.real_id) %]
 
 <div class='float-right'>
 [% L.hidden_tag('part_picker_real_id', FORM.real_id) %]
 
 <div class='float-right'>