Attachment 159086 Details for Bug 35216 – Bug 35216: Rename error to issuingimpossible

[patch] Bug 35216: Rename error to issuingimpossible

Bug-35216-Rename-error-to-issuingimpossible.patch (text/plain), 2.76 KB, created by Brendan Lawlor on 2023-11-17 14:35:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Lawlor

Created: 2023-11-17 14:35:05 UTC

Size: 2.76 KB

patch

obsolete

>From 4b8626be4e1bcd5ef199423d7377eff76ac7b782 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 1 Nov 2023 15:39:30 +0000
>Subject: [PATCH] Bug 35216: Rename error to issuingimpossible
>
>Test plan:
>1 - Apply two patches
>2 - Confirm code changes make sense
>3 - Confirm you can check out items
>4 - Confirm checkout blocks still block
>
>Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
>---
> circ/circulation.pl | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/circ/circulation.pl b/circ/circulation.pl
>index 7448a56859..da5e2b566a 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -317,9 +317,9 @@ if (@$barcodes) {
>         };
> 
>         # always check for blockers on issuing
>-        my ( $error, $needsconfirmation, $alerts, $messages );
>+        my ( $issuingimpossible, $needsconfirmation, $alerts, $messages );
>         try {
>-            ( $error, $needsconfirmation, $alerts, $messages ) = CanBookBeIssued(
>+            ( $issuingimpossible, $needsconfirmation, $alerts, $messages ) = CanBookBeIssued(
>                 $patron,
>                 $barcode, $datedue,
>                 $inprocess,
>@@ -333,7 +333,7 @@ if (@$barcodes) {
>             die $_ unless blessed $_ && $_->can('rethrow');
> 
>             if ( $_->isa('Koha::Exceptions::Calendar::NoOpenDays') ) {
>-                $error = { NO_OPEN_DAYS => 1 };
>+                $issuingimpossible = { NO_OPEN_DAYS => 1 };
>             } else {
>                 $_->rethrow;
>             }
>@@ -353,7 +353,7 @@ if (@$barcodes) {
> 
>     # Fix for bug 7494: optional checkout-time fallback search for a book
> 
>-    if ( $error->{'UNKNOWN_BARCODE'}
>+    if ( $issuingimpossible->{'UNKNOWN_BARCODE'}
>         && C4::Context->preference("itemBarcodeFallbackSearch")
>         && not $batch
>     )
>@@ -386,17 +386,17 @@ if (@$barcodes) {
>     my @blocking_error_codes =
>         ( $onsite_checkout and C4::Context->preference("OnSiteCheckoutsForce") )
>         ? qw( UNKNOWN_BARCODE NO_OPEN_DAYS )
>-        : ( keys %$error );
>+        : ( keys %$issuingimpossible );
> 
>-    if ( $error->{BOOKED_TO_ANOTHER} ) {
>-        $template_params->{BOOKED_TO_ANOTHER} = $error->{BOOKED_TO_ANOTHER};
>+    if ( $issuingimpossible->{BOOKED_TO_ANOTHER} ) {
>+        $template_params->{BOOKED_TO_ANOTHER} = $issuingimpossible->{BOOKED_TO_ANOTHER};
>         $template_params->{IMPOSSIBLE}        = 1;
>         $blocker                              = 1;
>     }
> 
>     foreach my $code ( @blocking_error_codes ) {
>-        if ($error->{$code}) {
>-            $template_params->{$code} = $error->{$code};
>+        if ($issuingimpossible->{$code}) {
>+            $template_params->{$code} = $issuingimpossible->{$code};
> 
>             $template_params->{IMPOSSIBLE} = 1;
>             $blocker = 1;
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35216: 158185 | 158186 | 158187 | 159039 | 159040 | 159056 | 159057 | 159072 | 159073 | 159085 | 159086 | 159180 | 159181