From 022ebd22895c987eb2227d8463b36e9a55d1d783 Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Fri, 24 Jun 2016 15:12:00 -0400 Subject: [PATCH] LP 1306666: Only change copy status if transit aborted at home. We now only change the copy status when the transit is aborted at the org. unit that owns the copy, i.e. the copy's circ_lib. This change comes as a result of discussion on the LP bug. Also, since we rebased on master, the test file was renamed to following the numbering of the other live Perl tests. Signed-off-by: Jason Stephenson --- Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm | 4 ++-- ...transit-copy-status.t => 19-lp1306666-abort-transit-copy-status.t} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename Open-ILS/src/perlmods/live_t/{17-lp1306666-abort-transit-copy-status.t => 19-lp1306666-abort-transit-copy-status.t} (100%) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm index d5185862a7..32a616425d 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm @@ -243,8 +243,8 @@ sub __abort_transit { return $e->die_event unless $e->delete_action_transit_copy($transit); - # Only change the copy status if the copy status is "In Transit." - if ($copy->status == OILS_COPY_STATUS_IN_TRANSIT) { + # Only change the copy status if the copy status is "In Transit" and the transit is aborted at home. + if ($copy->status == OILS_COPY_STATUS_IN_TRANSIT && $e->requestor->ws_ou == $copy->circ_lib) { # recover the copy status $copy->status( $transit->copy_status ); $copy->editor( $e->requestor->id ); diff --git a/Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t b/Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t similarity index 100% rename from Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t rename to Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t -- 2.11.0