[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3ace401ed850aa71eb555d7e30e0fe8c47dd6d0a

[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  3ace401ed850aa71eb555d7e30e0fe8c47dd6d0a (commit)
      from  f366eaeed22bdf54b5927e3b9beaea0ccc87216b (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 3ace401ed850aa71eb555d7e30e0fe8c47dd6d0a
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Tue Jan 31 10:48:25 2012 -0500

    Fix inability to suspend holds
    
    The hold status code was being used for "has the hold been captured", but
    the value for "frozen" was after the cutoff being assumed for "captured".
    
    So check for the suspended code specifically in the if, and don't return
    the suspended code if there is a capture time.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Bill Erickson <berick 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 9271c5d..5c840c5 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -935,7 +935,7 @@ sub update_hold_impl {
     # --------------------------------------------------------------
     if ($U->is_true($hold->frozen) and not $U->is_true($orig_hold->frozen)) {
         $hold_status = _hold_status($e, $hold);
-        if ($hold_status > 2) { # hold is captured
+        if ($hold_status > 2 && $hold_status != 7) { # hold is captured
             $logger->info("bypassing hold freeze on captured hold");
             return OpenILS::Event->new('HOLD_SUSPEND_AFTER_CAPTURE');
         }
@@ -1177,7 +1177,7 @@ sub _hold_status {
     if ($hold->cancel_time) {
         return 6;
     }
-    if ($U->is_true($hold->frozen)) {
+    if ($U->is_true($hold->frozen) && !$hold->capture_time) {
         return 7;
     }
     if ($hold->current_shelf_lib and $hold->current_shelf_lib ne $hold->pickup_lib) {

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

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


hooks/post-receive
-- 
Evergreen ILS