[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 87994668254d199213d51a2cb8b6db0532f67e48

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_1 has been updated
       via  87994668254d199213d51a2cb8b6db0532f67e48 (commit)
      from  f6801714e97cde8dde09f9137b7e2c4a5f019536 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 87994668254d199213d51a2cb8b6db0532f67e48
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Wed Jun 13 10:12:05 2012 -0400

    Fix in-transit hold retarget
    
    Tell the abort transit function to not commit our editor on us, basically.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 5332eab..525bd7b 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1668,7 +1668,7 @@ sub _reset_hold {
 				my $trans = $e->retrieve_action_transit_copy($transid);
 				if( $trans ) {
 					$logger->info("Aborting transit [$transid] on hold [$hid] reset...");
-					my $evt = OpenILS::Application::Circ::Transit::__abort_transit($e, $trans, $copy, 1);
+					my $evt = OpenILS::Application::Circ::Transit::__abort_transit($e, $trans, $copy, 1, 1);
 					$logger->info("Transit abort completed with result $evt");
 					unless ("$evt" eq 1) {
                         $e->rollback;
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 aa3d044..6585167 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
@@ -219,7 +219,7 @@ sub abort_transit {
 
 sub __abort_transit {
 
-	my( $e, $transit, $copy, $no_reset_hold ) = @_;
+	my( $e, $transit, $copy, $no_reset_hold, $no_commit ) = @_;
 
 	my $evt;
 	my $hold;
@@ -251,7 +251,7 @@ sub __abort_transit {
 	return $e->event unless $e->delete_action_transit_copy($transit);
 	return $e->event unless $e->update_asset_copy($copy);
 
-	$e->commit;
+	$e->commit unless $no_commit;
 
 	# if this is a hold transit, un-capture/un-target the hold
 	if($holdtransit and !$no_reset_hold) {

-----------------------------------------------------------------------

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    2 +-
 .../lib/OpenILS/Application/Circ/Transit.pm        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS