Attachment 116814 Details for Bug 27068 – Bug 27068: Don't 'cache' Koha::Libraries

[patch] Bug 27068: Don't 'cache' Koha::Libraries

Bug-27068-Dont-cache-KohaLibraries.patch (text/plain), 2.27 KB, created by Jonathan Druart on 2021-02-12 11:12:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-02-12 11:12:48 UTC

Size: 2.27 KB

patch

obsolete

>From b5341c5bfd54e93b1e72456f37d3f1502afb1b94 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 12 Feb 2021 12:10:31 +0100
>Subject: [PATCH] Bug 27068: Don't 'cache' Koha::Libraries
>
>---
> C4/HoldsQueue.pm | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
>diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
>index b18adca6c1..943879e172 100644
>--- a/C4/HoldsQueue.pm
>+++ b/C4/HoldsQueue.pm
>@@ -370,28 +370,21 @@ sub GetItemsAvailableToFillHoldRequestsForBib {
> 
> =cut
> 
>-our $libraries = {};
> sub _checkHoldPolicy {
>     my ($item, $request) = @_;
> 
>     return 0 unless $item->{holdallowed};
>     return 0 if $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch};
> 
>-    $libraries->{$item->{homebranch}} ||= Koha::Libraries->find($item->{homebranch});
>-    my $library = $libraries->{$item->{homebranch}};
>-
>-    return 0 if $item->{'holdallowed'} == 3 && !$library->validate_hold_sibling({branchcode => $request->{borrowerbranch}});
>+    return 0 if $item->{'holdallowed'} == 3 && !Koha::Libraries->find($item->{homebranch})->validate_hold_sibling({branchcode => $request->{borrowerbranch}});
> 
>     my $hold_fulfillment_policy = $item->{hold_fulfillment_policy};
> 
>-    return 0 if $hold_fulfillment_policy eq 'holdgroup' && !$library->validate_hold_sibling({branchcode => $request->{branchcode}});
>+    return 0 if $hold_fulfillment_policy eq 'holdgroup' && !Koha::Libraries->find($item->{homebranch})->validate_hold_sibling({branchcode => $request->{branchcode}});
>     return 0 if $hold_fulfillment_policy eq 'homebranch' && $request->{branchcode} ne $item->{$hold_fulfillment_policy};
>     return 0 if $hold_fulfillment_policy eq 'holdingbranch' && $request->{branchcode} ne $item->{$hold_fulfillment_policy};
> 
>-    $libraries->{$request->{borrowerbranch}} ||= Koha::Libraries->find($request->{borrowerbranch});
>-    my $patronLibrary = $libraries->{$request->{borrowerbranch}};
>-
>-    return 0 if $hold_fulfillment_policy eq 'patrongroup' && !$patronLibrary->validate_hold_sibling({branchcode => $request->{branchcode}});
>+    return 0 if $hold_fulfillment_policy eq 'patrongroup' && !Koha::Libraries->find($request->{borrowerbranch})->validate_hold_sibling({branchcode => $request->{branchcode}});
> 
>     return 1;
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27068: 113900 | 114125 | 114140 | 114141 | 114142 | 115987 | 116022 | 116023 | 116024 | 116025 | 116026 | 116607 | 116608 | 116609 | 116610 | 116814 | 116815 | 116816 | 116817 | 117215