Bugzilla – Attachment 154366 Details for
Bug 29822
Use table column selection modal for DefaultPatronSearchFields preference
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29822: (QA follow-up) Use pipe for all field separators
Bug-29822-QA-follow-up-Use-pipe-for-all-field-sepa.patch (text/plain), 2.72 KB, created by
Nick Clemens (kidclamp)
on 2023-08-11 12:16:19 UTC
(
hide
)
Description:
Bug 29822: (QA follow-up) Use pipe for all field separators
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2023-08-11 12:16:19 UTC
Size:
2.72 KB
patch
obsolete
>From 5956fab058127a5bcc70c2b6480db7e890bd49a9 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 11 Aug 2023 11:31:24 +0000 >Subject: [PATCH] Bug 29822: (QA follow-up) Use pipe for all field separators > >- Tidy atomic update > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > installer/data/mysql/atomicupdate/bug_29822.pl | 6 ++++-- > .../intranet-tmpl/prog/en/includes/patronfields.inc | 9 ++++----- > 2 files changed, 8 insertions(+), 7 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_29822.pl b/installer/data/mysql/atomicupdate/bug_29822.pl >index 73c0dfdfea..31e806a18b 100755 >--- a/installer/data/mysql/atomicupdate/bug_29822.pl >+++ b/installer/data/mysql/atomicupdate/bug_29822.pl >@@ -8,13 +8,15 @@ return { > my ( $dbh, $out ) = @$args{qw(dbh out)}; > > # Do you stuffs here >- $dbh->do(q{ >+ $dbh->do( >+ q{ > UPDATE systempreferences > SET > value = REPLACE( value, ',', '|' ) > WHERE > variable = 'DefaultPatronSearchFields' >- }); >+ } >+ ); > say $out "Updated system preference 'DefaultPatronSearchFields"; > }, > }; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >index b4c5047863..03e6d49022 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patronfields.inc >@@ -87,12 +87,11 @@ > <select name="searchfieldstype" id="searchfieldstype_filter"> > [% END %] > [% 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' %] >+ [% 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' %] > [% default_fields = [ standard, 'surname', 'cardnumber', all_emails, 'borrowernumber', 'userid', all_phones, full_address, 'dateofbirth', 'sort1', 'sort2' ] %] >- [% search_options = default_fields.merge(standard.split(',')).unique %] >+ [% search_options = default_fields.merge(standard.split('\|')).unique %] > [% FOREACH s_o IN search_options %] > [% display_name = PROCESS patron_fields name=s_o %] > [% NEXT IF !display_name %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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