@@ -, +, @@ --- .../prog/js/patron-autocomplete.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js +++ a/koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js @@ -13,22 +13,22 @@ function patron_autocomplete(node, options) { on_select_callback = options['on-select-callback']; } } - const search_fields = ['me.surname', 'me.firstname', 'me.cardnumber']; + const search_fields = ['surname', 'firstname', 'cardnumber']; return node.autocomplete({ source: function( request, response ) { let subquery_and = []; request.term.split(' ') .filter(function(s){ return s.length }) .forEach(function(pattern,i){ - subquery_and.push( - [ - {'me.surname': {'like': '%' + pattern + '%'}}, - {'me.firstname': {'like': '%' + pattern + '%'}}, - {'me.cardnumber': {'like': pattern + '%'}}, - ] - ); + let subquery_or = []; + search_fields.forEach(function(field,i){ + subquery_or.push( + {["me."+field]: {'like': '%' + pattern + '%'}} + ); + }); + subquery_and.push(subquery_or); }); - let q = {"-and": subquery_and}; + let q = {"-and": subquery_and }; let params = { '_page': 1, '_per_page': 10, --