X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fautocomplete_project.js;h=6a566c444d28f5a9cbcd8adac3940fc38834c561;hb=43816cb7289ee9225c3bb229d077bd87a75562cc;hp=7255ffd8acdf751fca8a2c4066574d48b9baf1f4;hpb=3873385f84a2af41d00e1154bfa4a8a47c761aeb;p=kivitendo-erp.git diff --git a/js/autocomplete_project.js b/js/autocomplete_project.js index 7255ffd8a..6a566c444 100644 --- a/js/autocomplete_project.js +++ b/js/autocomplete_project.js @@ -25,7 +25,7 @@ namespace('kivi', function(k){ var o = $.extend({ limit: 20, delay: 50, - }, options); + }, $real.data('project-picker-data'), options); var STATES = { PICKED: CLASSES.PICKED, UNDEFINED: CLASSES.UNDEFINED @@ -70,14 +70,32 @@ namespace('kivi', function(k){ function ajax_data(term) { var data = { 'filter.all:substr:multi::ilike': term, - 'filter.valid': 'valid', - 'filter.active': 'active', no_paginate: $('#no_paginate').prop('checked') ? 1 : 0, current: $real.val(), }; - if ($customer_id && $customer_id.val()) - data['filter.customer_id'] = $customer_id.val().split(','); + if (o.customer_id) + data['filter.customer_id'] = o.customer_id.split(','); + + if (o.active) { + if (o.active === 'active') data['filter.active'] = 'active'; + if (o.active === 'inactive') data['filter.active'] = 'inactive'; + // both => no filter + } else { + data['filter.active'] = 'active'; // default + } + + if (o.valid) { + if (o.valid === 'valid') data['filter.valid'] = 'valid'; + if (o.valid === 'invalid') data['filter.valid'] = 'invalid'; + // both => no filter + } else { + data['filter.valid'] = 'valid'; // default + } + + if (o.description_style) + data['description_style'] = o.description_style; + return data; } @@ -245,7 +263,6 @@ namespace('kivi', function(k){ var pp = { real: function() { return $real }, dummy: function() { return $dummy }, - customer_id: function() { return $customer_id }, update_results: update_results, result_timer: result_timer, set_item: set_item,