[open-ils-commits] [GIT] Evergreen ILS branch master updated. 97c7b4dd8664a73486aa6c813ed6804c88f640cb

[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  97c7b4dd8664a73486aa6c813ed6804c88f640cb (commit)
      from  efb83e6c54b0cbd00415b23eab0376c130953247 (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 97c7b4dd8664a73486aa6c813ed6804c88f640cb
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Wed Feb 1 14:16:53 2012 -0500

    Fix HoldIsAvailable validator
    
    Depending on the environment some things may be ids or references.
    
    Comparisons should try and use the IDs only, so pull the IDs out.
    
    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/Trigger/Validator.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm
index 57563e0..55c5742 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Validator.pm
@@ -77,7 +77,8 @@ sub HoldIsAvailable {
         !$hold->cancel_time and
         !$hold->fulfillment_time and
         $hold->current_shelf_lib and
-        $hold->current_shelf_lib eq $hold->pickup_lib and
+        (ref $hold->current_shelf_lib ? $hold->current_shelf_lib->id : $hold->current_shelf_lib)
+            eq (ref $hold->pickup_lib ? $hold->pickup_lib->id : $hold->pickup_lib) and
         $hold->capture_time and # redundant
         $hold->current_copy and # redundant
         $hold->shelf_time and   # redundant

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

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


hooks/post-receive
-- 
Evergreen ILS