ajax_autocomplete umgestellt auf get_models und inline JSON (20% schneller als template)

[mfinanz.git] / js / autocomplete_part.js

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index 90e4312f0211fef7a4237ca6e7000b6754add9a6..00bdc5dd67b47f1b6a55d9ed9aaa52ed4af5572b 100644 (file)
--- 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({
     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,
           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;
         id: 'part_selection',
       });
       return true;


@@ -33,11 +29,11 @@ namespace('kivi', function(k){
 
     function ajax_data(term) {
       return {
 
     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() },
         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',
     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) }
       });
     };
         success: function(data){ $('#part_picker_result').html(data) }
       });
     };