From 2394175e8d3b7b479fd603b426f26a05f44eae5b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 5 Aug 2019 09:02:15 -0500 Subject: [PATCH] Bug 23253: (bug 22318 follow-up) Fix OpacNavRight even if opacuserlogin is off There are other occurrences of OpavNavRight that bug 22318 forgot to adjust to use the news system instead of the syspref. Test plan: - turn off opacuserlogin - create a news for OpacNavRight - go to the opac main page => Confirm that the OpacNavRight content is displayed correctly. Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit ee7ba48bfe9d3f43bbc1bb88f62bf12854e5a838) Signed-off-by: Fridolin Somers --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index b48e92284f..0150881623 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -42,6 +42,7 @@ [% END %] + [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %] [% IF ( OpacNav || OpacNavBottom ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
[% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %] @@ -213,7 +214,7 @@ [% END %] [% END # /loggedinusername %] [% END # /opacuserlogin %] - [% PROCESS koha_news_block news => KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %] + [% PROCESS koha_news_block news => OpacNavRight %]
[% END # /opacuserlogin || OpacNavRight %] -- 2.39.5