[open-ils-commits] r10595 - trunk/Open-ILS/src/perlmods/OpenILS/Application

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-09-15 12:55:23 -0400 (Mon, 15 Sep 2008)
New Revision: 10595

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
Log:
fixed perm check.  also, if no count is provided, falls back to configured max

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2008-09-15 16:41:47 UTC (rev 10594)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ.pm	2008-09-15 16:55:23 UTC (rev 10595)
@@ -616,9 +616,10 @@
             $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;
 
     return $e->search_action_circulation([