[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 179c419590eb4fd1968da60aee5cdd3035cecf6f

[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  179c419590eb4fd1968da60aee5cdd3035cecf6f (commit)
      from  7f3951d310dbd06ef5b3efd2565ffa7777ad4c7f (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 179c419590eb4fd1968da60aee5cdd3035cecf6f
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Jun 22 10:48:58 2011 -0400

    Check if hold is really available in Trigger::Validator.
    
    Add checks for shelf time and no fulfillment time in
    HoldIsAvailable in OpenILS::Application::Trigger::Validator.
    
    We've had some issues with poorly migrated data and people
    messing with holds that causes the original logic to trigger
    for unfilled holds. Plus, the extra precaution of checking
    more precise conditions of an actually filled hold can't hurt,
    can it?
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm
index 260af53..98e18cc 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm
@@ -77,6 +77,8 @@ sub HoldIsAvailable {
         !$hold->cancel_time and
         $hold->capture_time and 
         $hold->current_copy and
+        $hold->shelf_time and
+        !$hold->fulfillment_time and
         $hold->current_copy->status == OILS_COPY_STATUS_ON_HOLDS_SHELF;
 
     return 0;

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

Summary of changes:
 .../lib/OpenILS/Application/Trigger/Validator.pm   |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS