Attachment 91325 Details for Bug 23057 – Bug 23057: (QA follow-up) Remove new AddReturn message ReturnOfLostItemBlocked, use existing pattern from returns.pl

[patch] Bug 23057: (QA follow-up) Remove new AddReturn message ReturnOfLostItemBlocked, use existing pattern from returns.pl

Bug-23057-QA-follow-up-Remove-new-AddReturn-messag.patch (text/plain), 2.06 KB, created by Marcel de Rooy on 2019-07-05 08:43:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2019-07-05 08:43:34 UTC

Size: 2.06 KB

patch

obsolete

>From 02612d13fa8fb24a1c86e2f8408f3f463c9a4cee Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 11 Jun 2019 07:46:57 -0400
>Subject: [PATCH] Bug 23057: (QA follow-up) Remove new AddReturn message
> ReturnOfLostItemBlocked, use existing pattern from returns.pl
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>
>Signed-off-by: Matha Fuerst <mfuerst@hmcpl.org>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Circulation.pm                 | 1 -
> C4/SIP/ILS/Transaction/Checkin.pm | 6 +++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 4c6228244e..560abc1430 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -1945,7 +1945,6 @@ sub AddReturn {
>     }
> 
>     if ( $item->itemlost and C4::Context->preference("BlockReturnOfLostItems") ) {
>-        $messages->{'ReturnOfLostItemBlocked'};
>         $doreturn = 0;
>     }
> 
>diff --git a/C4/SIP/ILS/Transaction/Checkin.pm b/C4/SIP/ILS/Transaction/Checkin.pm
>index eed26c1544..f0e8bbdf49 100644
>--- a/C4/SIP/ILS/Transaction/Checkin.pm
>+++ b/C4/SIP/ILS/Transaction/Checkin.pm
>@@ -89,8 +89,8 @@ sub do_checkin {
>     if ($messages->{withdrawn}) {
>         $self->alert_type('99');
>     }
>-    if ($messages->{ReturnOfLostItemBlocked}) {
>-        $self->alert_type('99');
>+    if ($messages->{WasLost}) {
>+        $self->alert_type('99') if C4::Context->preference("BlockReturnOfLostItems");
>     }
>     if ($messages->{Wrongbranch}) {
>         $self->{item}->destination_loc($messages->{Wrongbranch}->{Rightbranch});
>@@ -128,7 +128,7 @@ sub do_checkin {
>         $self->{item}->hold_patron_id( $messages->{ResFound}->{borrowernumber} );
>         $self->{item}->destination_loc( $messages->{ResFound}->{branchcode} );
>     }
>-    # ignoring messages: NotIssued, WasLost, WasTransfered
>+    # ignoring messages: NotIssued, WasTransfered
> 
>     if ($cv_triggers_alert) {
>         $self->alert( defined $self->alert_type ); # Overwrites existing alert value, should set to 0 if there is no alert type
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23057: 90344 | 90377 | 90384 | 90385 | 90388 | 90479 | 90480 | 90505 | 90506 | 90507 | 90508 | 91322 | 91323 | 91324 | 91325 | 91326 | 91644