Attachment 107175 Details for Bug 20799 – Bug 20799: (QA follow-up) Move syspref check

[patch] Bug 20799: (QA follow-up) Move syspref check

Bug-20799-QA-follow-up-Move-syspref-check.patch (text/plain), 1.83 KB, created by Martin Renvoize (ashimema) on 2020-07-22 09:10:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-07-22 09:10:41 UTC

Size: 1.83 KB

patch

obsolete

>From 0c7de890b5fc5cb696dc4bfc80aef0c3ac7830af Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 22 Jul 2020 10:09:29 +0100
>Subject: [PATCH] Bug 20799: (QA follow-up) Move syspref check
>
>This patch moves the syspref check into the controller to save a DB
>query if the module is not enabled.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> catalogue/detail.pl                                         | 5 ++++-
> koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index 5e10954a63..d01de155a6 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -540,7 +540,10 @@ my $holds = $biblio->holds;
> $template->param( holdcount => $holds->count );
> 
> # Check if there are any ILL requests connected to the biblio
>-my $illrequests = Koha::Illrequests->search({ biblio_id => $biblionumber });
>+my $illrequests =
>+    C4::Context->preference('ILLModule')
>+  ? Koha::Illrequests->search( { biblio_id => $biblionumber } )
>+  : [];
> $template->param( illrequests => $illrequests );
> 
> my $StaffDetailItemSelection = C4::Context->preference('StaffDetailItemSelection');
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index f0f41dc128..d1635babeb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -128,7 +128,7 @@
>             </span>
>         [% END %]
> 
>-        [% IF ( Koha.Preference( 'ILLModule' ) && illrequests.count ) %]
>+        [% IF illrequests.count ) %]
>             <span class="results_summary">
>                 <span class="label">ILL requests:</span>
>                 [% IF CAN_user_ill %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 20799: 96102 | 96103 | 96105 | 106407 | 106408 | 106584 | 106585 | 107175 | 107277