From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 22 Aug 2012 14:43:53 +0000 (-0400)
Subject: Clear-shelf includes pickup-lib changes : Perl repairs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fc0cc6ded5a65e5625d2a6661b2a8475ac2ab397;p=evergreen%2Fequinox.git

Clear-shelf includes pickup-lib changes : Perl repairs

Signed-off-by: Bill Erickson <berick@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 5b523e8bdc..f58dabc042 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -3449,21 +3449,21 @@ sub clear_shelf_process {
 
     if ($e->commit) {
 
-
-
         my %cache_data = (
             hold => [],
             transit => [],
             shelf => [],
-
-            # if requested, find any holds on our shelf whose pickup lib
-            # has been changed to some other branch and include those in
-            # the clear-shelf cache.  But, only add them to the pl_changed 
-            # list if they are not otherwise getting canceled by this process.
-            pl_changed => 1 ? # TODO ORG SETTING
-                pickup_lib_changed_on_shelf_holds($e, $org_id, \@hold_ids) : []
+            pl_changed => []
         );
 
+        # if requested, find any holds on our shelf whose pickup lib
+        # has been changed to some other branch and include those in
+        # the clear-shelf cache.  But, only add them to the pl_changed 
+        # list if they are not otherwise getting canceled by this process.
+        $cache_data{pl_changed} = 
+            pickup_lib_changed_on_shelf_holds($e, $org_id, \@hold_ids)
+            if $U->ou_ancestor_setting_value($org_id, 'circ.holds.clear_shelf.include_pl_changed');
+
         for my $hold (@holds) {
 
             my $copy = $hold->current_copy;