[Koha-patches] [PATCH] [SIGNED-OFF] bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
Nicole C. Engard
nengard at bywatersolutions.com
Thu Sep 8 02:06:12 CEST 2011
From: Srdjan Jankovic <srdjan at catalyst.net.nz>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
---
reserve/request.pl | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/reserve/request.pl b/reserve/request.pl
index 0c952b4..71762f8 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -434,22 +434,18 @@ foreach my $biblionumber (@biblionumbers) {
$policy_holdallowed = 0;
}
- if (IsAvailableForItemLevelRequest($itemnumber) and
- not $item->{cantreserve} and
- CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) {
- if ( $policy_holdallowed ) {
+ if ( $policy_holdallowed &&
+ !$item->{cantreserve} &&
+ IsAvailableForItemLevelRequest($itemnumber) &&
+ CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber)
+ ) {
$item->{available} = 1;
$num_available++;
- }
} elsif (C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {
+ # If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
$item->{override} = 1;
$num_override++;
}
- # If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
- if (C4::Context->preference( 'AllowHoldPolicyOverride' ) && !$item->{available} ) {
- $item->{override} = 1;
- $num_override++;
- }
# If none of the conditions hold true, then neither override nor available is set and the item cannot be checked
--
1.7.2.3
More information about the Koha-patches
mailing list