[open-ils-commits] [GIT] Evergreen ILS branch master updated. 664516c733997dfa1954a7ce6cb80a4a153cb07c

[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, master has been updated
       via  664516c733997dfa1954a7ce6cb80a4a153cb07c (commit)
      from  e4246f0bc28d615a57ccd3d95febd20a0eb2d1dd (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 664516c733997dfa1954a7ce6cb80a4a153cb07c
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 6e4f2b8..6132846 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1866,7 +1866,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 428afed..31e2a95 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
@@ -221,7 +221,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;
@@ -253,7 +253,7 @@ sub __abort_transit {
 	return $e->die_event unless $e->delete_action_transit_copy($transit);
 	return $e->die_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