From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 15 Sep 2008 16:55:23 +0000 (+0000)
Subject: fixed perm check.  also, if no count is provided, falls back to configured max
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=76b0a57c18d8ede8773bceb74718cf9a2f064cee;p=Evergreen.git

fixed perm check.  also, if no count is provided, falls back to configured max

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10595 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
index 3748feb1ff..3d6f3d0b3d 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
@@ -616,8 +616,9 @@ sub view_circs {
             $copy->circ_lib : $copy->call_number->owning_lib);
         
     my $max_history = $U->ou_ancestor_setting_value(
-        $user->home_ou, 'circ.item_checkout_history.max', $e);
-    $count = ($max_history and $max_history < $count) ? $max_history : $count;
+        $e->requestor->ws_ou, 'circ.item_checkout_history.max', $e);
+
+    $count = $max_history if $max_history and (!$count or $count > $max_history);
 
 	return [] unless $count;