Attachment 108200 Details for Bug 25261 – Bug 25261: (follow-up) item.material may contain non-numerics

[patch] Bug 25261: (follow-up) item.material may contain non-numerics

Bug-25261-follow-up-itemmaterial-may-contain-non-n.patch (text/plain), 1.82 KB, created by Martin Renvoize (ashimema) on 2020-08-13 17:03:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-08-13 17:03:40 UTC

Size: 1.82 KB

patch

obsolete

>From f3927140ad2c24dbd7ba8228bde0941c9734ddc8 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 6 May 2020 09:25:37 +0100
>Subject: [PATCH] Bug 25261: (follow-up) item.material may contain non-numerics
>
>Whilst QAing bug 13547 it was highlighted to me the at the 952$3 field,
>and thus the item.materials field, may contain arbitrary notes about the
>material rather than just numeric values. As such we need to check for
>the field being defined as aposed to greater than '0'.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Circulation.pm | 5 ++---
> circ/returns.pl   | 2 +-
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index f156bb4898..0501bc2021 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -881,9 +881,8 @@ sub CanBookBeIssued {
> 
>     # Additional Materials Check
>     if ( C4::Context->preference("CircConfirmItemParts") ) {
>-        my $no_of_parts = $item_object->materials || 0;
>-        if ( $no_of_parts > 0 ) {
>-            $needsconfirmation{additional_materials} = $no_of_parts;
>+        if ( $item_object->materials ) {
>+            $needsconfirmation{additional_materials} = $item_object->materials;
>         }
>     }
> 
>diff --git a/circ/returns.pl b/circ/returns.pl
>index 204d624fdd..7c7db6b166 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -298,7 +298,7 @@ if ($barcode) {
>     # Block return if multi-part and confirm has not been received
>     my $needs_confirm = 0;
>     if ( C4::Context->preference("CircConfirmItemParts") ) {
>-        if ( $item->materials > 0 && !$query->param('multiple_confirm') ) {
>+        if ( $item->materials && !$query->param('multiple_confirm') ) {
>                 $needs_confirm = 1;
>         }
>     }
>-- 
>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