From df6ff8e543c36ff95f2022d670e118ca21822bfb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 2 Feb 2026 12:04:45 +0100 Subject: [PATCH] Bug 41746: Compare order using DBMS's ORDER BY --- Koha/Devel/Sysprefs.pm | 5 +---- installer/data/mysql/mandatory/sysprefs.sql | 4 ++-- t/db_dependent/check_sysprefs.t | 21 ++++++++------------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Koha/Devel/Sysprefs.pm b/Koha/Devel/Sysprefs.pm index 09e9e13231a..9bfcefe929b 100644 --- a/Koha/Devel/Sysprefs.pm +++ b/Koha/Devel/Sysprefs.pm @@ -158,10 +158,7 @@ sub add_new_pref { @sysprefs = sort { defined $a->{variable} && defined $b->{variable} - && ( lc( $a->{variable} ) =~ s/_/ZZZ/gr ) - cmp( - lc( $b->{variable} ) =~ - s/_/ZZZ/gr ) # mysql sorts underscore last, if you modify this qa-test-tools will need adjustments + && ( lc( $a->{variable} ) =~ s/_/ /gr ) cmp( lc( $b->{variable} ) =~ s/_/ /gr ) || defined $a->{variable} } @sysprefs; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 9d91ed1861e..aac74ecc964 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -311,10 +311,10 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('GoogleOpenIDConnectDefaultBranch', '',NULL,'This branch code will be used to create Google OpenID Connect patrons.','Textarea'), ('GoogleOpenIDConnectDefaultCategory','',NULL,'This category code will be used to create Google OpenID Connect patrons.','Textarea'), ('GoogleOpenIDConnectDomain', '', NULL, 'Restrict Google OpenID Connect to this domain (or subdomains of this domain). Leave blank for all Google domains', 'Free'), +('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'), ('hidelostitems','0',NULL,'If ON, disables display of"lost" items in OPAC.','YesNo'), ('HidePatronName','0',NULL,'If this is switched on, patron\'s cardnumber will be shown instead of their name on the holds and catalog screens','YesNo'), ('HidePersonalPatronDetailOnCirculation', '0', NULL, 'Hide patrons phone number, email address, street address and city in the circulation page','YesNo'), -('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'), ('HoldCancellationRequestSIP','0',NULL,'Option to set holds cancelled via SIP as cancellation requests','YesNo'), ('HoldFeeMode','not_always','any_time_is_placed|not_always|any_time_is_collected','Set the hold fee mode','Choice'), ('HoldRatioDefault','3',NULL,'Default value for the hold ratio report','Integer'), @@ -355,6 +355,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'), ('IndependentBranchesPatronModifications','0', NULL, 'Show only modification request for the logged in branch','YesNo'), ('IndependentBranchesTransfers','0', NULL, 'Allow non-superlibrarians to transfer items between libraries','YesNo'), +('intranet_includes','includes',NULL,'The includes directory you want for specific look of Koha (includes or includes_npl for example)','Free'), ('IntranetAddMastheadLibraryPulldown','0', NULL, 'Add a library select pulldown menu on the staff header search','YesNo'), ('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'), ('intranetbookbag','1',NULL,'If ON, enables display of Cart feature in the intranet','YesNo'), @@ -371,7 +372,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('intranetstylesheet','',NULL,'Enter a complete URL to use an alternate layout stylesheet in Intranet','Free'), ('IntranetUserCSS','',NULL,'Add CSS to be included in the intranet in an embedded