Bugzilla – Attachment 85958 Details for
Bug 18925
Move maxissueqty and maxonsiteissueqty to circulation_rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18925: Fix null/empty behavior, again
Bug-18925-Fix-nullempty-behavior-again.patch (text/plain), 2.00 KB, created by
Tomás Cohen Arazi (tcohen)
on 2019-03-02 19:34:02 UTC
(
hide
)
Description:
Bug 18925: Fix null/empty behavior, again
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2019-03-02 19:34:02 UTC
Size:
2.00 KB
patch
obsolete
>From 9cdbcf126b42fbf6e3c4e2e900b1e5748803a204 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 21 Feb 2019 17:04:36 -0300 >Subject: [PATCH] Bug 18925: Fix null/empty behavior, again > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > C4/Circulation.pm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 533612ecab..c99a8a8e6e 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.21.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18925
:
65238
|
65239
|
65240
|
67024
|
67025
|
67026
|
67621
|
70992
|
70993
|
70994
|
70995
|
70996
|
71032
|
71033
|
71043
|
71044
|
71045
|
71046
|
71047
|
72225
|
72226
|
72227
|
72228
|
72229
|
77225
|
77226
|
77227
|
77228
|
77229
|
78881
|
78882
|
78883
|
78884
|
78885
|
78886
|
79642
|
79643
|
79644
|
79645
|
79646
|
81091
|
81092
|
81093
|
81094
|
81095
|
82927
|
82928
|
82929
|
82930
|
82931
|
85480
|
85481
|
85482
|
85483
|
85484
|
85485
|
85486
|
85939
|
85940
|
85941
|
85942
|
85943
|
85944
|
85945
|
85946
|
85947
|
85948
|
85949
|
85950
|
85951
|
85953
|
85954
|
85955
|
85956
|
85957
|
85958
|
85959
|
85960
|
85961
|
85962
|
85963
|
85964
|
85965
|
86068
|
86069
|
86070
|
86071
|
86072
|
86073
|
86074
|
86075
|
86076
|
86077
|
86078
|
86079
|
86080
|
86081
|
86121
|
86165
|
86206
|
86207