From: Thomas Berezansky <tsbere@mvlc.org>
Date: Thu, 26 Jul 2012 14:25:32 +0000 (-0400)
Subject: Make Force/Recall holds always return as nearest
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b8e64dbd70608ea91432a9b8fff5d956d3eb7a7d;p=working%2FEvergreen.git

Make Force/Recall holds always return as nearest

Without even running the hold rules.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

Conflicts:
	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm

(Just whitespace conflicts on tab vs space -- repaired by hand.)
---

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 afd61d5a2e..5f95694eac 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -3013,6 +3013,11 @@ sub find_nearest_permitted_hold {
         $logger->info("circulator: checking if hold $holdid is permitted for copy $bc");
 
         my $hold = $editor->retrieve_action_hold_request($holdid) or next;
+        # Force and recall holds bypass all rules
+        if ($hold->hold_type eq 'R' || $hold->hold_type eq 'F') {
+            $best_hold = $hold;
+            last;
+        }
         my $reqr = $reqr_cache{$hold->requestor} || $editor->retrieve_actor_user($hold->requestor);
         my $rlib = $org_cache{$hold->request_lib} || $editor->retrieve_actor_org_unit($hold->request_lib);