From b9668481e8d9356a5a39b5f859b398094d5e27ba Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 11 May 2023 11:31:09 +0200 Subject: [PATCH] Bug 29822: Escape backslash on split + effectively replace 'standard', don't display it. + avoid mixing | and , --- .../intranet-tmpl/prog/en/includes/patron-search.inc | 3 ++- koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc | 2 +- koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js | 2 +- t/db_dependent/selenium/patrons_search.t | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index ca82654efb7..87efada5fa4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -307,12 +307,13 @@ let search_fields = $("#searchfieldstype_filter").val(); if ( !search_fields ) { search_fields = "[% Koha.Preference('DefaultPatronSearchFields') || 'firstname|middle_name|surname|othernames|cardnumber|userid' | html %]"; + search_fields.replaceAll('\|', ','); } let subquery_and = []; patterns.forEach(function(pattern,i){ let sub_or = []; - search_fields.split('|').forEach(function(attr,ii){ + search_fields.split(',').forEach(function(attr,ii){ sub_or.push({["me."+attr]:{"like":(search_type == "contain" ? "%" : "" ) + pattern + "%"}}); if ( attr == 'dateofbirth' ) { try { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc index b4c50478635..9ec62c2d10e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc @@ -87,7 +87,7 @@