Attachment 110359 Details for Bug 25261 – Bug 25261: (follow-up) Rename CircConfirmParts to CircConfirmItemParts

[patch] Bug 25261: (follow-up) Rename CircConfirmParts to CircConfirmItemParts

Bug-25261-follow-up-Rename-CircConfirmParts-to-Cir.patch (text/plain), 5.15 KB, created by Katrin Fischer on 2020-09-18 10:56:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-09-18 10:56:55 UTC

Size: 5.15 KB

patch

obsolete

>From b85c75473c2085278615221c5b1d653e14b11b15 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <kyle@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> C4/Circulation.pm                                                     | 2 +-
> circ/returns.pl                                                       | 2 +-
> installer/data/mysql/atomicupdate/bug_25261.perl                      | 4 ++--
> installer/data/mysql/sysprefs.sql                                     | 2 +-
> .../intranet-tmpl/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 01efe873f7..f891858912 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 c1acebbc3f..dd803e71b2 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.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25261: 103856 | 103857 | 104011 | 104012 | 104013 | 104404 | 104405 | 104406 | 104407 | 104408 | 104409 | 104410 | 104411 | 104412 | 104413 | 104414 | 107217 | 107218 | 107219 | 107220 | 107221 | 107222 | 107228 | 107229 | 107230 | 107231 | 107232 | 107233 | 107234 | 107285 | 107331 | 107822 | 107823 | 108196 | 108197 | 108198 | 108199 | 108200 | 108201 | 108202 | 108203 | 108204 | 108205 | 108206 | 108207 | 108208 | 108230 | 108231 | 108232 | 108233 | 108234 | 108235 | 108236 | 108237 | 108238 | 108239 | 108240 | 108241 | 108242 | 109478 | 109479 | 109480 | 109481 | 109482 | 109483 | 109484 | 109485 | 109486 | 109487 | 109488 | 109489 | 109490 | 109491 | 109492 | 109493 | 109494 | 109495 | 109496 | 109497 | 109498 | 109499 | 109500 | 109501 | 109502 | 109503 | 109504 | 109508 | 110038 | 110039 | 110040 | 110041 | 110042 | 110043 | 110044 | 110045 | 110046 | 110047 | 110048 | 110049 | 110050 | 110051 | 110052 | 110133 | 110184 | 110258 | 110259 | 110268 | 110322 | 110323 | 110324 | 110325 | 110326 | 110327 | 110328 | 110329 | 110330 | 110331 | 110332 | 110333 | 110334 | 110335 | 110336 | 110337 | 110338 | 110339 | 110340 | 110341 | 110356 | 110357 | 110358 | 110359 | 110360 | 110361 | 110362 | 110363 | 110364 | 110365 | 110366 | 110367 | 110368 | 110369 | 110370 | 110371 | 110372 | 110373 | 110374 | 110375 | 110915 | 110916 | 110917 | 110918 | 110919 | 110920 | 110921 | 110922 | 110923 | 110924 | 110925 | 110926 | 110927 | 110928 | 110929 | 110930 | 110931 | 110932 | 110933 | 110934 | 111027