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>

JD - amended patch: removing trailing parenthesis in the IF statement

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 5e10954..d01de15 100755 (executable)
--- 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 96a8ebc..dbb1ca1 100644 (file)
--- 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 %]