Bugzilla – Attachment 173207 Details for
Bug 38148
Check value of holdallowed circ rule properly (Bug 29087 follow-up)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38148: Revert back to get_effective_rule
Bug-38148-Revert-back-to-geteffectiverule.patch (text/plain), 2.00 KB, created by
Nick Clemens (kidclamp)
on 2024-10-23 11:51:26 UTC
(
hide
)
Description:
Bug 38148: Revert back to get_effective_rule
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2024-10-23 11:51:26 UTC
Size:
2.00 KB
patch
obsolete
>From 97cc042b41b6bd141c9b2eba4901e56089891ef2 Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Tue, 22 Oct 2024 10:48:14 +0000 >Subject: [PATCH] Bug 38148: Revert back to get_effective_rule > >And update the first conditional logic. >This patch aims to maintain the logic behind the first patch, but restore get_effective_rule. >get_effective_rule_value is using cache and I believe that is the reason why Items.t fail when using that. > >Test plan: >1) Search for 'music' on OPAC >2) Notice records have the 'place hold' link >3) Visit circulation rules on Staff: ><staff_url>/cgi-bin/koha/admin/smart-rules.pl >4) On 'Default checkout, hold and return policy' , under 'Hold policy' pick 'From any library'. Hit 'Save'. >5) Repeat 1). Notice the 'place hold' link is gone. >6) Apply patch. restart plack. Repeat 1). Notice the 'place hold' is shown again > >Run: >$ prove t/db_dependent/Koha/Items.t > >Signed-off-by: andrewa <andrew.auld@ptfs-europe.com> >Signed-off-by: Ray Delahunty <r.delahunty@arts.ac.uk> >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > Koha/Items.pm | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > >diff --git a/Koha/Items.pm b/Koha/Items.pm >index 8ef9f6f038e..dd8d6c47cfa 100644 >--- a/Koha/Items.pm >+++ b/Koha/Items.pm >@@ -61,16 +61,13 @@ placing a hold on one of those items. > sub filter_by_for_hold { > my ($self) = @_; > >- my $default_rule = Koha::CirculationRules->get_effective_rule_value( >+ my $default_rule = Koha::CirculationRules->get_effective_rule( > { > rule_name => 'holdallowed', >- itemtype => undef, >- branchcode => undef, >- categorycode => undef, > } > ); > my @hold_not_allowed_itypes; >- if ($default_rule eq 'not_allowed') { >+ if ( defined $default_rule && $default_rule->rule_value eq 'not_allowed' ) { > @hold_not_allowed_itypes = Koha::ItemTypes->search->get_column('itemtype'); > my @hold_allowed_itypes = Koha::CirculationRules->search( > { >-- >2.39.5
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 38148
:
172680
|
172681
|
172929
|
173125
|
173141
|
173142
|
173143
|
173144
|
173169
|
173170
|
173183
|
173184
|
173185
|
173205
|
173206
| 173207 |
173208