[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. b8e64dbd70608ea91432a9b8fff5d956d3eb7a7d
Evergreen Git
git at git.evergreen-ils.org
Fri Jun 7 12:44:51 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_3 has been updated
via b8e64dbd70608ea91432a9b8fff5d956d3eb7a7d (commit)
from feaf67e09fe4d44065d5dadfc4ec20247db00df8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b8e64dbd70608ea91432a9b8fff5d956d3eb7a7d
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Thu Jul 26 10:25:32 2012 -0400
Make Force/Recall holds always return as nearest
Without even running the hold rules.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Mike Rylander <mrylander at 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 afd61d5..5f95694 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);
-----------------------------------------------------------------------
Summary of changes:
.../perlmods/lib/OpenILS/Application/Circ/Holds.pm | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list