Attachment 110268 Details for Bug 25261 – Bug 25261: (QA follow-up) Prevent server error on bad barcode

[patch] Bug 25261: (QA follow-up) Prevent server error on bad barcode

Bug-25261-QA-follow-up-Prevent-server-error-on-bad.patch (text/plain), 1.11 KB, created by Martin Renvoize (ashimema) on 2020-09-17 14:02:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-17 14:02:57 UTC

Size: 1.11 KB

patch

obsolete

>From 324b63f21fd8012e2a10f3c1b558d2850f8491e5 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 17 Sep 2020 15:01:32 +0100
>Subject: [PATCH] Bug 25261: (QA follow-up) Prevent server error on bad barcode
>
>Prior to this patch if you had CircConfirmParts enabled and you
>attempted to checkin a deleted item then you would be met with a server
>error.
>---
> circ/returns.pl | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/circ/returns.pl b/circ/returns.pl
>index b1b05f1959..5c8ce00d7a 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -297,9 +297,11 @@ if ($barcode) {
>     # Block return if multi-part and confirm has not been received
>     my $needs_confirm =
>          C4::Context->preference("CircConfirmItemParts")
>+      && $item
>       && $item->materials
>       && !$query->param('multiple_confirm');
>-    $template->param('multiple_confirmed' => 1) if $query->param('multiple_confirm');
>+    $template->param( 'multiple_confirmed' => 1 )
>+      if $query->param('multiple_confirm');
> 
>     # do the return
>     ( $returned, $messages, $issue, $borrower ) =
>-- 
>2.20.1

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