From 24dab792e3acd12dc2ca7f2573b480a223db98ad Mon Sep 17 00:00:00 2001 From: Emily Lamancusa Date: Fri, 9 May 2025 13:43:53 -0400 Subject: [PATCH] Bug 23010: (QA follow-up) a few trivial fixes - Update the dbrev to use say_success, and make dbrev and installer consistent - Change error div in moredetail.tt from info to warning Signed-off-by: Emily Lamancusa Signed-off-by: Lucas Gass (cherry picked from commit 3096833130de225d35ae0ef3915267d6d984c920) Signed-off-by: Paul Derscheid --- .../bug_23010_add_PreventWithdrawingItemsStatus.pl | 4 ++-- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_23010_add_PreventWithdrawingItemsStatus.pl b/installer/data/mysql/atomicupdate/bug_23010_add_PreventWithdrawingItemsStatus.pl index 1fa805b3e7..f279bd5021 100755 --- a/installer/data/mysql/atomicupdate/bug_23010_add_PreventWithdrawingItemsStatus.pl +++ b/installer/data/mysql/atomicupdate/bug_23010_add_PreventWithdrawingItemsStatus.pl @@ -11,10 +11,10 @@ return { $dbh->do( q{ INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`) - VALUES ('PreventWithdrawingItemsStatus',NULL,'','Prevent the withdrawing of items based on statuses','Choice') + VALUES ('PreventWithdrawingItemsStatus','','','Prevent the withdrawing of items based on statuses','multiple') } ); - say $out "Added new system preference 'PreventWithdrawingItemsStatus'"; + say_success( $out, "Added new system preference 'PreventWithdrawingItemsStatus'" ); }, }; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index d8a735a363..a11238d35c 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -646,7 +646,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('PreservationNotForLoanDefaultTrainIn', '', '', 'Not for loan to apply to items removed from the preservation waiting list', 'TextArea'), ('PreservationNotForLoanWaitingListIn', '', '', 'Not for loan to apply to items added to the preservation waiting list', 'TextArea'), ('PreserveSerialNotes','1','','When a new "Expected" issue is generated, should it be prefilled with last created issue notes?','YesNo'), -('PreventWithdrawingItemsStatus', '1', '', 'Prevent the withdrawing of items based on certain statuses' , 'multiple'), +('PreventWithdrawingItemsStatus', '', '', 'Prevent the withdrawing of items based on certain statuses' , 'multiple'), ('previousIssuesDefaultSortOrder','asc','asc|desc','Specify the sort order of Previous Issues on the circulation page','Choice'), ('PrintNoticesMaxLines','0','','If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.','Integer'), ('PrivacyPolicyConsent','','Enforced|Permissive|Disabled','Data privacy policy consent in the OPAC', 'Choice'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 2a3d57d1ff..84526221a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -153,7 +153,7 @@ [% SET not_for_loan_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) %] [% END %] [% IF withdraw_error %] -
+
[% IF withdraw_error == 'intransit_cannot_withdraw' %] Cannot withdraw item in transit. [% END %]