From dc1f52b868212947e02f6c1d2e1a6db754598d1a Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 28 Jan 2022 20:02:15 -1000 Subject: [PATCH] Bug 17018: (QA follow-up) OpacAdvancedSearchTypes is type multiple Change from Bug 29878, AdvancedSearchTypes is type multiple, so same for OpacAdvancedSearchTypes. Also remove 'OPAC' from AdvancedSearchTypes preference description. In atomic update, break long line and use q{} like in other DBRevs. --- installer/data/mysql/atomicupdate/bug-17018.pl | 9 ++++++--- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/searching.pref | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug-17018.pl b/installer/data/mysql/atomicupdate/bug-17018.pl index 58facba735..b930d25dcf 100755 --- a/installer/data/mysql/atomicupdate/bug-17018.pl +++ b/installer/data/mysql/atomicupdate/bug-17018.pl @@ -7,7 +7,10 @@ return { my ($args) = @_; my $dbh = $args->{dbh}; - $dbh->do( "INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) SELECT 'OpacAdvancedSearchTypes', `value`, `options`, 'Select which set of fields are available as limits on the OPAC advanced search page', `type` FROM systempreferences WHERE variable = 'AdvancedSearchTypes'" ); - + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) + SELECT 'OpacAdvancedSearchTypes', `value`, `options`, 'Select which set of fields are available as limits on the OPAC advanced search page', `type` + FROM systempreferences WHERE variable = 'AdvancedSearchTypes'" ); + }); }, -} +}; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index db8b095445..2940e15824 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -389,7 +389,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'), ('OpacAdvSearchMoreOptions','pubdate,itemtype,language,subtype,sorting,location','Show search options for the expanded view (More options)','pubdate|itemtype|language|subtype|sorting|location','multiple'), ('OpacAdvSearchOptions','pubdate,itemtype,language,sorting,location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'), -('OpacAdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields are available as limits on the OPAC advanced search page','Choice'), +('OpacAdvancedSearchTypes','itemtypes','itemtypes,ccode,loc','Select which set of fields are available as limits on the OPAC advanced search page','multiple'), ('OPACAllowHoldDateInFuture','0','','If set, along with the AllowHoldDateInFuture system preference, OPAC users can set the date of a hold to be in the future.','YesNo'), ('OpacAllowPublicListCreation','1',NULL,'If set, allows opac users to create public lists','YesNo'), ('OpacAllowSharingPrivateLists','0',NULL,'If set, allows opac users to share private lists with other patrons','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref index f589b75cd6..c56de1a5d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref @@ -96,7 +96,7 @@ Searching: 0: "Don't add" - search history of the unlogged user to the next patron logging in. - - - Show tabs in the OPAC and staff interface advanced search for limiting searches by + - Show tabs in the staff interface advanced search for limiting searches by - pref: AdvancedSearchTypes multiple: itemtypes: Item type -- 2.34.0