From 77c7e7100f1d3312f04ed0604a872b3ac10a863b Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 4 Dec 2020 10:06:22 -0300 Subject: [PATCH] Bug 15448: (QA follow-up) Move fetching the rules outside the loop --- opac/opac-reserve.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 41a5394eb86..42cb990372a 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -73,6 +73,11 @@ for ( C4::Context->preference("OPACShowHoldQueueDetails") ) { my $patron = Koha::Patrons->find( $borrowernumber, { prefetch => ['categorycode'] } ); my $category = $patron->category; +# no OpacHiddenItems rules used if category is excepted +my $item_hide_rules = + ( $category->override_hidden_items ) + ? {} + : get_yaml_pref_hash('OpacHiddenItems'); my $can_place_hold_if_available_at_pickup = C4::Context->preference('OPACHoldsIfAvailableAtPickup'); unless ( $can_place_hold_if_available_at_pickup ) { @@ -463,13 +468,7 @@ foreach my $biblioNum (@biblionumbers) { my @notforloan_avs = Koha::AuthorisedValues->search_by_koha_field({ kohafield => 'items.notforloan', frameworkcode => $frameworkcode }); my $notforloan_label_of = { map { $_->authorised_value => $_->opac_description } @notforloan_avs }; - # no OpacHiddenItems rules used if category is excepted - my $rules = - ( $category->override_hidden_items ) - ? {} - : get_yaml_pref_hash('OpacHiddenItems'); - - my $visible_items = { map { $_->itemnumber => 1 } $biblio->items->filter_by_visible_in_opac( { rules => $rules } ) }; + my $visible_items = { map { $_->itemnumber => 1 } $biblio->items->filter_by_visible_in_opac( { rules => $item_hide_rules } ) }; # Only keep the items that are visible in the opac (i.e. those in %visible_items) # FIXME: We should get rid of itemInfos altogether and use $visible_items -- 2.29.2