From 2d3aaff84e0d467c0cc44ae9f99c88879b8bcc0d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 21 Feb 2019 17:04:36 -0300 Subject: [PATCH] Bug 18925: Fix null/empty behavior, again Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- C4/Circulation.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 58b8efb0f0..fcf1eab4f6 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -419,7 +419,7 @@ sub TooMany { |; my $rule_itemtype = $maxissueqty_rule->itemtype; - if ($rule_itemtype eq "*") { + unless ($rule_itemtype) { # matching rule has the default item type, so count only # those existing loans that don't fall under a more # specific rule @@ -457,7 +457,7 @@ sub TooMany { $count_query .= " AND borrowernumber = ? "; push @bind_params, $borrower->{'borrowernumber'}; my $rule_branch = $maxissueqty_rule->branchcode; - if ($rule_branch ne "*") { + unless ($rule_branch) { if (C4::Context->preference('CircControl') eq 'PickupLibrary') { $count_query .= " AND issues.branchcode = ? "; push @bind_params, $branch; @@ -471,8 +471,8 @@ sub TooMany { my ( $checkout_count, $onsite_checkout_count ) = $dbh->selectrow_array( $count_query, {}, @bind_params ); - my $max_checkouts_allowed = $maxissueqty_rule ? $maxissueqty_rule->rule_value : 0; - my $max_onsite_checkouts_allowed = $maxonsiteissueqty_rule ? $maxonsiteissueqty_rule->rule_value : 0; + my $max_checkouts_allowed = $maxissueqty_rule ? $maxissueqty_rule->rule_value : undef; + my $max_onsite_checkouts_allowed = $maxonsiteissueqty_rule ? $maxonsiteissueqty_rule->rule_value : undef; if ( $onsite_checkout and defined $max_onsite_checkouts_allowed ) { if ( $onsite_checkout_count >= $max_onsite_checkouts_allowed ) { -- 2.39.5