Attachment 154363 Details for Bug 29822 – Bug 29822: Update code to reference by pipe

[patch] Bug 29822: Update code to reference by pipe

Bug-29822-Update-code-to-reference-by-pipe.patch (text/plain), 3.79 KB, created by Nick Clemens (kidclamp) on 2023-08-11 12:16:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2023-08-11 12:16:10 UTC

Size: 3.79 KB

patch

obsolete

>From b1ca6353a764b1977cd37b165073bb76da1cd857 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 10 Feb 2023 15:22:04 +0000
>Subject: [PATCH] Bug 29822: Update code to reference by pipe
>
>Moving to modalselect also has the effect of moving from comma delimited
>to pipe delimitation for the preference contents
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc | 3 ++-
> koha-tmpl/intranet-tmpl/prog/js/staff-global.js           | 4 ++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
>index bd41d755a6..e3316361d6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
>@@ -69,7 +69,7 @@
> [% END %]
> 
> <script>
>-    var defaultPatronSearchFields = "[% Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' | html %]";
>+    var defaultPatronSearchFields = "[% Koha.Preference('DefaultPatronSearchFields') || 'firstname|middle_name|surname|othernames|cardnumber|userid' | html %]";
>     var defaultPatronSearchMethod = "[% Koha.Preference('DefaultPatronSearchMethod') || 'contains' | html %]";
>     var extendedPatronAttributes = "[% Koha.Preference('ExtendedPatronAttributes') | html %]";
>     var loggedInLibrary = '[% Branches.GetLoggedInBranchcode | html %]';
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
>index c48fa6c28a..b4c5047863 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc
>@@ -86,7 +86,8 @@
>         <label for="searchfieldstype_filter">Search field:</label>
>         <select name="searchfieldstype" id="searchfieldstype_filter">
>     [% END %]
>-        [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname,middle_name,surname,othernames,cardnumber,userid' %]
>+        [% SET standard = Koha.Preference('DefaultPatronSearchFields') || 'firstname|middle_name|surname|othernames|cardnumber|userid' %]
>+        [% standard.replace('|', ',') %]
>         [% SET full_address = 'streetnumber,streettype,address,address2,city,state,zipcode,country' %]
>         [% SET all_emails = 'email,emailpro,B_email' %]
>         [% SET all_phones = 'phone,phonepro,B_phone,altcontactphone,mobile' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>index abb3193bd7..af34820654 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
>@@ -557,7 +557,7 @@ function buildPatronSearchQuery(term, options) {
>     let pattern_subquery_and = [];
>     patterns.forEach(function (pattern, i) {
>             let pattern_subquery_or = [];
>-            search_fields.split(',').forEach(function (field, i) {
>+            search_fields.split('|').forEach(function (field, i) {
>                 pattern_subquery_or.push(
>                     { ["me." + field]: { 'like': leading_wildcard + pattern + '%' } }
>                 );
>@@ -576,7 +576,7 @@ function buildPatronSearchQuery(term, options) {
> 
>     // Add full search term for each search field
>     let term_subquery_or = [];
>-    search_fields.split(',').forEach(function (field, i) {
>+    search_fields.split('|').forEach(function (field, i) {
>         term_subquery_or.push(
>             { ["me." + field]: { 'like': leading_wildcard + term + '%' } }
>         );
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 29822: 144814 | 144831 | 146430 | 146445 | 146488 | 146489 | 146490 | 146491 | 146492 | 147433 | 147434 | 147435 | 147436 | 147437 | 149890 | 149891 | 149892 | 149893 | 149894 | 151058 | 151059 | 151060 | 151061 | 151062 | 151064 | 151233 | 151234 | 151235 | 151236 | 151237 | 151238 | 153373 | 153374 | 153375 | 153376 | 153377 | 153378 | 153379 | 153380 | 153381 | 153382 | 153383 | 153384 | 153442 | 153443 | 153444 | 153445 | 153446 | 153447 | 154361 | 154362 | 154363 | 154364 | 154365 | 154366