From 43e0b298bf5c235dd21a60bbd42cddb04c505264 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 13 Jan 2021 11:39:27 +0100
Subject: [PATCH] Bug 20212: Fix query for the global filter

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/intranet-tmpl/prog/js/datatables.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
index 0b42d4313b..9d03a108a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js
@@ -564,13 +564,12 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
                                 };
 
 
-                                function build_query(col){
+                                function build_query(col, value){
                                     var parts = [];
                                     var attributes = col.data.split(':');
                                     for (var i=0;i<attributes.length;i++){
                                         var part = {};
                                         var attr = attributes[i];
-                                        var value = data.columns[col.idx].search.value;
                                         part[!attr.includes('.')?'me.'+attr:attr] = options.criteria === 'exact'
                                             ? value
                                             : {like: (['contains', 'ends_with'].indexOf(options.criteria) !== -1?'%':'') + value + (['contains', 'starts_with'].indexOf(options.criteria) !== -1?'%':'')};
@@ -586,7 +585,8 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
                                     return col.bSearchable && typeof col.data == 'string' && data.columns[col.idx].search.value != ''
                                 })
                                 .map(function(col) {
-                                    return build_query(col)
+                                    var value = data.columns[col.idx].search.value;
+                                    return build_query(col, value)
                                 })
                                 .map(function r(e){
                                     return ($.isArray(e) ? $.map(e, r) : e);
@@ -598,7 +598,8 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) {
                                     return col.bSearchable && typeof col.data == 'string' && data.columns[col.idx].search.value == '' && filter != ''
                                 })
                                 .map(function(col) {
-                                    return build_query(col)
+                                    var value = filter;
+                                    return build_query(col, value)
                                 })
                                 .map(function r(e){
                                     return ($.isArray(e) ? $.map(e, r) : e);
-- 
2.39.5