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

[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  4aa356436a9ad2fab31bc0ef763cd678a4dc910c (commit)
      from  7d92d37b31e172a2192457567125bae9647ed3be (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 4aa356436a9ad2fab31bc0ef763cd678a4dc910c
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed Mar 2 10:30:24 2016 -0500

    LP#1312699 Circ history clear-all repair
    
    Repairs circ ID filter to allow all items in circ history to clear when
    patrons disable circulation history.
    
    open-ils.cstore will fail on {in => undef} queries.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
index 873ad3b..40bb6a6e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
@@ -4279,11 +4279,12 @@ sub user_circ_history {
         $limits{limit} = $options->{limit} if defined $options->{limit};
     }
 
-    my $circ_id_list = $options->{circ_ids} ? $options->{circ_ids} : undef;
+    my %circ_id_filter = $options->{circ_ids} ?
+        (id => $options->{circ_ids}) : ();
 
     my $circs = $e->search_action_user_circ_history([
         {   usr => $e->requestor->id,
-            id  => {'in' => $circ_id_list},
+            %circ_id_filter
         },
         {   # order newest to oldest by default
             order_by => {auch => 'xact_start DESC'},

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

Summary of changes:
 .../src/perlmods/lib/OpenILS/Application/Actor.pm  |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS