Bugzilla – Attachment 85956 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: Replace logic in GetBranchBorrowerCircRule with get_effective_rule
Bug-18925-Replace-logic-in-GetBranchBorrowerCircRu.patch (text/plain), 2.27 KB, created by
Tomás Cohen Arazi (tcohen)
on 2019-03-02 19:33:44 UTC
(
hide
)
Description:
Bug 18925: Replace logic in GetBranchBorrowerCircRule with get_effective_rule
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2019-03-02 19:33:44 UTC
Size:
2.27 KB
patch
obsolete
>From 45aaf6f111b098cb89e6dc67fa8e6270d9e1cfdb Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Sat, 15 Sep 2018 13:19:04 -0700 >Subject: [PATCH] Bug 18925: Replace logic in GetBranchBorrowerCircRule with > get_effective_rule > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > C4/Circulation.pm | 45 +++++++++------------------------------------ > 1 file changed, 9 insertions(+), 36 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index c23839e516..533612ecab 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1617,30 +1617,6 @@ wildcards. > sub GetBranchBorrowerCircRule { > my ( $branchcode, $categorycode ) = @_; > >- # Set search prededences >- my @params = ( >- { >- branchcode => $branchcode, >- categorycode => $categorycode, >- itemtype => undef, >- }, >- { >- branchcode => $branchcode, >- categorycode => undef, >- itemtype => undef, >- }, >- { >- branchcode => undef, >- categorycode => $categorycode, >- itemtype => undef, >- }, >- { >- branchcode => undef, >- categorycode => undef, >- itemtype => undef, >- }, >- ); >- > # Initialize default values > my $rules = { > patron_maxissueqty => undef, >@@ -1649,19 +1625,16 @@ sub GetBranchBorrowerCircRule { > > # Search for rules! > foreach my $rule_name (qw( patron_maxissueqty patron_maxonsiteissueqty )) { >- foreach my $params (@params) { >- my $rule = Koha::CirculationRules->search( >- { >- rule_name => $rule_name, >- %$params, >- } >- )->next(); >- >- if ( $rule ) { >- $rules->{$rule_name} = $rule->rule_value; >- last; >+ my $rule = Koha::CirculationRules->get_effective_rule( >+ { >+ categorycode => $categorycode, >+ itemtype => undef, >+ branchcode => $branchcode, >+ rule_name => $rule_name, > } >- } >+ ); >+ >+ $rules->{$rule_name} = $rule->rule_value if defined $rule; > } > > return $rules; >-- >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