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

[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  a54edeb8a1546f7c1f36cd05c583fcff5220ad01 (commit)
      from  cbf389d42138d18990539a6281be191d8dc6dee2 (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 a54edeb8a1546f7c1f36cd05c583fcff5220ad01
Author: Steven Callender <stevecallender at esilibrary.com>
Date:   Mon Oct 15 10:48:28 2012 -0400

    Added a check for the money.collections_tracker table when using the open-ils.collections.users_of_interest.warning_penalty.retrieve API call.
    
    Users that are already entered into the money.collections_tracker table should not be recalled from the open-ils.collections.users_of_interest.warning_penalty.retrieve API. This change will check for the existance of the user in the money.colletions_tracker table.
    
    Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm
index f1d6e36..8d61327 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Collections.pm
@@ -221,6 +221,12 @@ sub users_of_interest_warning_penalty {
                         aus => {
                             type => 'left',
                             filter => {name => 'circ.collections.exempt'}
+                        },
+                        mct => {
+                            type => 'left',
+                            filter => {
+                                location => [ map {$_->{id}} @$org_ids ]
+                            }
                         }
                     }
                 }
@@ -237,7 +243,10 @@ sub users_of_interest_warning_penalty {
             },
             # We are only interested in users that do not have the
             # circ.collections.exempt setting applied
-            '+aus' => {value => undef}
+            '+aus' => {value => undef},
+            # and we're only interested in users that are not in the
+            # collections tracker table
+            '+mct' => {id => undef}
         }
     };
 

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

Summary of changes:
 .../lib/OpenILS/Application/Collections.pm         |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS