From c6464d55601f98746ac7327141e538484a8842f2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 7 Jun 2019 12:10:01 +0000 Subject: [PATCH] Bug 23076: Include OpacUserJS on OPAC maintenance page This patch coverts the syntax for embedding OpacUserJS in the global include file so that it uses 'Koha.Preference' syntax. This makes the data available in templates, like the OPAC maintenance page, to which the preference data has not been explicitly provided. To reproduce: Add some JavaScript to the OPACUserJS system preference which will let you know it's working. For instance: alert("OPACUserJS!"); Turn on the OPAC maintenance message using the OpacMaintenance system preference. Navigate to the OPAC. You should see the system maintenance page but you should not see an alert. To test, apply the patch and reload the OPAC page. Your alert should show. Signed-off-by: Maryse Simard Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 82dcb5cf546c881af0003c272d9326e12fb5f1ce) Signed-off-by: Fridolin Somers --- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index ffeebcdb18..a8494dec85 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -301,11 +301,9 @@ $(document).ready(function() { }); [% PROCESS jsinclude %] -[% IF ( OPACUserJS ) %] +[% IF ( Koha.Preference('OPACUserJS') ) %] [% END %] [% IF SCO_login %] -- 2.39.2