[open-ils-commits] r8809 - in branches/rel_1_2_1: Evergreen/src/javascript/backend/circ Open-ILS/src/javascript/backend/circ Open-ILS/src/perlmods/OpenILS/Application/Circ Open-ILS/src/perlmods/OpenILS/Utils

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-21 18:59:36 -0500 (Thu, 21 Feb 2008)
New Revision: 8809

Modified:
   branches/rel_1_2_1/Evergreen/src/javascript/backend/circ/circ_permit_hold.js
   branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_lib.js
   branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
   branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
   branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Utils/PermitHold.pm
Log:
added hold permit flag for new holds to prevent max-holds checks on existing holds

Modified: branches/rel_1_2_1/Evergreen/src/javascript/backend/circ/circ_permit_hold.js
===================================================================
--- branches/rel_1_2_1/Evergreen/src/javascript/backend/circ/circ_permit_hold.js	2008-02-21 17:34:28 UTC (rev 8808)
+++ branches/rel_1_2_1/Evergreen/src/javascript/backend/circ/circ_permit_hold.js	2008-02-21 23:59:36 UTC (rev 8809)
@@ -10,10 +10,12 @@
 
 /* non-staff members are allowed 50 open holds at most */
 if( ! isStaffHold ) {
-   var count = userHoldCount(patron.id);
-   log_info("patron has " + count + " open holds");
-   if( count >= 50 ) 
-      result.events.push('MAX_HOLDS');
+    if(newHold) {
+        var count = userHoldCount(patron.id);
+        log_info("patron has " + count + " open holds");
+        if( count >= 50 ) 
+            result.events.push('MAX_HOLDS');
+    }
 } else {
     log_info("This is a staff-placed hold");
 }

Modified: branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_lib.js
===================================================================
--- branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_lib.js	2008-02-21 17:34:28 UTC (rev 8808)
+++ branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_lib.js	2008-02-21 23:59:36 UTC (rev 8809)
@@ -42,6 +42,7 @@
 var holdRequestLib	= environment.requestLib;
 var holdPickupLib       = environment.pickupLib; /* hold pickup lib */
 var requestor = environment.requestor || patron;
+var newHold = environment.newHold;
 
 
 

Modified: branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js
===================================================================
--- branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js	2008-02-21 17:34:28 UTC (rev 8808)
+++ branches/rel_1_2_1/Open-ILS/src/javascript/backend/circ/circ_permit_hold.js	2008-02-21 23:59:36 UTC (rev 8809)
@@ -17,14 +17,20 @@
 
 var config = findGroupConfig(patronProfile);
 
+
 if( config ) {
 
     /* see if they have too many items out */
-    var limit = config.maxHolds;
-    var count = userHoldCount(patron.id);
-    if( limit >= 0 && count >= limit ) {
-        log_info("patron has " + count + " open holds");
-        result.events.push('MAX_HOLDS');
+    if(newHold) {
+        log_info("This is a new hold, checking maxHolds...");
+        var limit = config.maxHolds;
+        var count = userHoldCount(patron.id);
+        if( limit >= 0 && count >= limit ) {
+            log_info("patron has " + count + " open holds");
+            result.events.push('MAX_HOLDS');
+        }
+    } else {
+        log_info("Ignoring maxHolds on existing hold...");
     }
 }
 

Modified: branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
===================================================================
--- branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2008-02-21 17:34:28 UTC (rev 8808)
+++ branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2008-02-21 23:59:36 UTC (rev 8809)
@@ -1218,7 +1218,8 @@
 			title				=> $title, 
 			title_descriptor	=> $title->fixed_fields, # this is fleshed into the title object
 			pickup_lib			=> $pickup_lib,
-			request_lib			=> $request_lib 
+			request_lib			=> $request_lib,
+            new_hold            => 1
 		} 
 	);
 	return 0;

Modified: branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Utils/PermitHold.pm
===================================================================
--- branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Utils/PermitHold.pm	2008-02-21 17:34:28 UTC (rev 8808)
+++ branches/rel_1_2_1/Open-ILS/src/perlmods/OpenILS/Utils/PermitHold.pm	2008-02-21 23:59:36 UTC (rev 8809)
@@ -34,6 +34,7 @@
 		_direct	=> {
 			requestLib	=> $$params{request_lib},
 			pickupLib	=> $$params{pickup_lib},
+            newHold    => $$params{new_hold},
 		}
 	};