Attachment 121718 Details for Bug 28520 – Bug 28520: Revert "Bug 12362: (QA follow-up) Fix ModItemTransfer cancellation handling"

[patch] Bug 28520: Revert "Bug 12362: (QA follow-up) Fix ModItemTransfer cancellation handling"

Bug-28520-Revert-Bug-12362-QA-follow-up-Fix-ModIte.patch (text/plain), 1.55 KB, created by Martin Renvoize (ashimema) on 2021-06-08 12:05:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-06-08 12:05:33 UTC

Size: 1.55 KB

patch

obsolete

>From ec96502047275e01cb1674ce11ee7970765ad096 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi>
>Date: Tue, 8 Jun 2021 07:47:32 +0000
>Subject: [PATCH] Bug 28520: Revert "Bug 12362: (QA follow-up) Fix
> ModItemTransfer cancellation handling"
>
>This reverts commit fbba09f63f200d3e57a8612554984d807867cf84.
>
>This commit was part of a series adding adding reverse transfers, i.e.
>transfers that were created for transfers that were cancelled and
>we wanted the item to return back to its sending library. This however
>hid the information about transfer happening and we need another approach
>to the problem.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> Koha/Item.pm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Item.pm b/Koha/Item.pm
>index 730a73bc8d..47a86eb0bb 100644
>--- a/Koha/Item.pm
>+++ b/Koha/Item.pm
>@@ -456,6 +456,9 @@ sub request_transfer {
>     Koha::Exceptions::Item::Transfer::InQueue->throw( transfer => $request )
>       if ( $request && !$params->{enqueue} && !$params->{replace} );
> 
>+    $request->cancel( { reason => $params->{reason}, force => 1 } )
>+      if ( defined($request) && $params->{replace} );
>+
>     my $transfer = Koha::Item::Transfer->new(
>         {
>             itemnumber    => $self->itemnumber,
>@@ -467,9 +470,6 @@ sub request_transfer {
>         }
>     )->store();
> 
>-    $request->cancel( { reason => $params->{reason}, force => 1, replace => 1 } )
>-      if ( defined($request) && $params->{replace} );
>-
>     return $transfer;
> }
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28520: 121686 | 121689 | 121690 | 121691 | 121693 | 121708 | 121709 | 121710 | 121711 | 121712 | 121718 | 121719 | 121720 | 121721 | 121722 | 121843 | 121844 | 121845 | 121846 | 121847 | 121951 | 121952 | 121953 | 121954 | 121955 | 121985 | 122005 | 122006 | 122007