From 326a8b098a819f54c1f1a25f282ab7f8bf86e5b2 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 6 May 2020 09:20:32 +0100 Subject: [PATCH] Bug 25261: (follow-up) Rename CircConfirmParts to CircConfirmItemParts This clarifies the preference name to make it clear we are talking about the 'parts' that make up an 'item'. 'Part' is a well known term in british english libraries and I think perhaps 'Materials' may be confused with other terms? Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize --- C4/Circulation.pm | 2 +- circ/returns.pl | 2 +- installer/data/mysql/atomicupdate/bug_25261.perl | 4 ++-- installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 1090f58ee7..777bde3d48 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -898,7 +898,7 @@ sub CanBookBeIssued { } # Additional Materials Check - if ( C4::Context->preference("CircConfirmParts") ) { + if ( C4::Context->preference("CircConfirmItemParts") ) { my $no_of_parts = $item_object->materials || 0; if ( $no_of_parts > 0 ) { $needsconfirmation{additional_materials} = $no_of_parts; diff --git a/circ/returns.pl b/circ/returns.pl index 050a661011..4f45903355 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -296,7 +296,7 @@ if ($barcode) { # Block return if multi-part and confirm has not been received my $needs_confirm = 0; - if ( C4::Context->preference("CircConfirmParts") ) { + if ( C4::Context->preference("CircConfirmItemParts") ) { if ( $item->materials > 0 && !$query->param('multiple_confirm') ) { $needs_confirm = 1; } diff --git a/installer/data/mysql/atomicupdate/bug_25261.perl b/installer/data/mysql/atomicupdate/bug_25261.perl index ef3b7c41a5..e6f48dacaf 100644 --- a/installer/data/mysql/atomicupdate/bug_25261.perl +++ b/installer/data/mysql/atomicupdate/bug_25261.perl @@ -1,6 +1,6 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { - $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('CircConfirmParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'YesNo') }); + $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('CircConfirmItemParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'YesNo') }); - NewVersion( $DBversion, 25261, "Add CircConfirmParts syspref"); + NewVersion( $DBversion, 25261, "Add CircConfirmItemParts syspref"); } diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 57539b423b..3ff95fbd5b 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -124,7 +124,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('CataloguingLog','1',NULL,'If ON, log edit/create/delete actions on bibliographic data. WARNING: this feature is very resource consuming.','YesNo'), ('CheckPrevCheckout','hardno','hardyes|softyes|softno|hardno','By default, for every item checked out, should we warn if the patron has borrowed that item in the past?','Choice'), ('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'), -('CircConfirmParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'Yes/No'), +('CircConfirmItemParts', '0', NULL, 'Require staff to confirm that all parts of an item are present at checkin/checkout.', 'Yes/No'), ('CircControl','ItemHomeLibrary','PickupLibrary|PatronLibrary|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'), ('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'), ('CirculateILL','0','','If enabled, it is possible to circulate ILL items from within ILL','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index c413e227e0..bb948dbaa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -7,7 +7,7 @@ Circulation: no: Deactivate - the navigation sidebar on all circulation pages. - - - pref: CircConfirmParts + - pref: CircConfirmItemParts choices: yes: "Require" no: "Don't require" -- 2.20.1