From 85ac1671341b1028239e077f84ddf5b535bd0a14 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 15 Feb 2022 16:35:38 +0000 Subject: [PATCH] Bug 30055: (follow-up) Clarify 'AND' logic --- .../intranet-tmpl/prog/en/modules/members/search.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt index d74f044ea2..f0bc68819b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt @@ -165,7 +165,7 @@ if (!start_with) return ""; return { "like": start_with + "%" } }, - "-and": function(){ + "-or": function(){ let filter = $("#searchmember_filter").val(); if (!filter) return ""; [% SET search_fields = Koha.Preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index f369fbebfc..1c5c6f7f7b 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -610,15 +610,7 @@ jQuery.fn.dataTable.ext.errMode = function(settings, note, message) { k = f; v = default_filters[f]; } - // Pass to -or if you want a separate OR clause - // It's not the usual DBIC notation! - if ( f == '-or' ) { - if (v) or_query_parameters.push(v) - } else if ( f == '-and' ) { - if (v) and_query_parameters.push(v) - } else if ( v ) { - additional_filters[k] = v; - } + additional_filters[k] = v; } if ( Object.keys(additional_filters).length ) { and_query_parameters.push(additional_filters); -- 2.20.1