Bugzilla – Attachment 115760 Details for
Bug 24223
Convert OpacNav system preference to news block
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24223: (follow-up) Make logged-in user's branchcode available to template
Bug-24223-follow-up-Make-logged-in-users-branchcod.patch (text/plain), 48.44 KB, created by
Owen Leonard
on 2021-01-25 12:27:36 UTC
(
hide
)
Description:
Bug 24223: (follow-up) Make logged-in user's branchcode available to template
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2021-01-25 12:27:36 UTC
Size:
48.44 KB
patch
obsolete
>From 8d9b08bdb13becd59a0d2f2ac480bf8114071375 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 5 Nov 2020 17:36:49 +0000 >Subject: [PATCH] Bug 24223: (follow-up) Make logged-in user's branchcode > available to template > >This patch makes a couple of corrections for problems I discovered >while working on Bug 24224: The variables required for correct display >of news items by branch and language were not consistently available to >the templates. > >In opac-readingrecord.pl, the "lang" variable was being overwritten. On >this and other pages the logged-in patron's brachcode was not made >available. I've corrected instances of KohaNews.get() to use the >globally-available "logged_in_user.branchcode" instead. > >To test, apply the patch and follow the original test plan, with the >addition of instances of the OpacNav news item which have a specific >library selected. > >Confirm that such items are correctly displayed according to the >logged-in user's home library. If there is no logged-in user the >library-specific OpacNav should not display. >--- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 6 +++--- > koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt | 2 +- > .../bootstrap/en/modules/opac-authoritiessearchresultlist.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 8 ++++---- > .../bootstrap/en/modules/opac-memberentry-update-submitted.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt | 2 +- > .../bootstrap/en/modules/opac-registration-confirmation.tt | 4 ++-- > .../bootstrap/en/modules/opac-registration-email-sent.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt | 2 +- > opac/opac-readingrecord.pl | 2 -- > 53 files changed, 58 insertions(+), 60 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc >index fa51c437d6..3598cb8864 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc >@@ -3,7 +3,7 @@ > [% USE KohaNews %] > [% PROCESS 'html_helpers.inc' %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] >-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > > <div id="wrapper"> > <div id="header-region" class="noprint"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >index 3c872b95c6..477dc9aa2c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sco.inc >@@ -3,7 +3,7 @@ > [% USE KohaNews %] > [% PROCESS 'html_helpers.inc' %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] >-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > > <div id="wrapper"> > <div id="header-region" class="noprint"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 85cbb9a4b0..b0ce9b7620 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -5,9 +5,9 @@ > [% USE KohaNews %] > [% PROCESS 'html_helpers.inc' %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] >-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %] >-[% SET OpacCustomSearch = KohaNews.get( location => "OpacCustomSearch", lang => lang, library => branchcode, blocktitle => 0 ) %] >-[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %] >+[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] >+[% SET OpacCustomSearch = KohaNews.get( location => "OpacCustomSearch", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] >+[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => logged_in_user.branchcode ) %] > > <div id="wrapper"> > <div id="header-region" class="noprint"> >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 03372af8d1..f265845cd1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -3,7 +3,7 @@ > [% USE KohaNews %] > [%- USE KohaPlugins -%] > [% USE Asset %] >-[% SET opaccredits = KohaNews.get( location => "opaccredits", lang => lang, library => branchcode ) %] >+[% SET opaccredits = KohaNews.get( location => "opaccredits", lang => lang, library => logged_in_user.branchcode ) %] > [% PROCESS 'html_helpers.inc' %] > [% UNLESS ( is_popup ) %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >index f04860e41a..4c9145c205 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >@@ -1,5 +1,5 @@ > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › An error has occurred</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt >index de6e2b10cc..63971cef29 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt >@@ -1,5 +1,5 @@ > [% USE Koha %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › > [% IF ( GetAvailability ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >index 198fc584f6..2095ccacfa 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >@@ -2,7 +2,7 @@ > [% USE Koha %] > [% USE KohaNews %] > [% INCLUDE 'doc-head-open.inc' %] >-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >index 90e152aac2..ea59827a57 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt >@@ -1,5 +1,5 @@ > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your payment > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index 3982b8a2bf..050071d77e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -7,7 +7,7 @@ > [% USE KohaNews %] > [% SET ENABLE_OPAC_PAYMENTS = Koha.Preference('EnablePayPalOpacPayments') || plugins %] > [% SET DISPLAY_PAYMENT_BLOCK = 0 %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your charges</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index fee3cf04ea..ccd602429a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -3,7 +3,7 @@ > [% USE Koha %] > [% USE KohaNews %] > [% PROCESS 'opac-authorities.inc' %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Entry [% authtypetext | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index 46fc6989dd..406e61bb09 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -3,7 +3,7 @@ > [% USE Koha %] > [% USE KohaNews %] > [% PROCESS 'opac-authorities.inc' %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Authority search › [% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >index 7644b8bc97..bc833d7852 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -3,7 +3,7 @@ > [% USE Categories %] > [% USE KohaNews %] > [% PROCESS 'html_helpers.inc' %] >-[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %] >+[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => logged_in_user.branchcode ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › > [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt >index bc459e0143..923bc9e363 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Authority search</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >index 85fb1f6149..87479a4629 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >@@ -1,7 +1,7 @@ > [% USE raw %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% PROCESS 'opac-authorities.inc' %] > [% PROCESS 'authorities-search-results.inc' %] > [% BLOCK pagination %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt >index a54404bc58..b28de81656 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% USE raw %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >index 7e6f45a56b..e241ebe336 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >index 6e58af0f2c..a6f3354e58 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Discharge</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >index ad52c6673e..24fff7a0ff 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% IF ( fullpage ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Download list [% shelf.shelfname | html %]</title>[% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >index 138402135e..59da92b380 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >@@ -2,7 +2,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Full subscription history for [% bibliotitle | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >index 65bf18e34b..9996816f9d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >@@ -3,7 +3,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your interlibrary loan requests</title>[% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %][% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >index 38f279499a..10f933442f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Images for: [% INCLUDE 'biblio-title-head.inc' %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >index aab1eb6ae3..c888a8cce9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt >@@ -2,7 +2,7 @@ > [% USE KohaDates %] > [% USE Branches %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Editing issue note for [% title | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >index 0eba2d085d..6e6a2e51f3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( LibraryNameTitle ) %] >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 771f69d5d1..f536c11a3d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -6,10 +6,10 @@ > [% USE Price %] > [% USE KohaNews %] > [% PROCESS 'i18n.inc' %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >-[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => branchcode ) %] >-[% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %] >-[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] >+[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => lang, library => logged_in_user.branchcode ) %] >+[% SET OpacMainUserBlock = KohaNews.get( location => "OpacMainUserBlock", lang => lang, library => logged_in_user.branchcode ) %] >+[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => logged_in_user.branchcode ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >index acad494131..3753809b2c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Updates submitted</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index 2236ff8983..ab17beb768 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -7,7 +7,7 @@ > [% USE KohaDates %] > [% USE Math %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% SET userupdateview = 1 %] > [% BLOCK streetnumber %] > [% UNLESS hidden.defined('streetnumber') %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >index 44f089ae0a..c048e0b3fb 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %][% ELSE %]Koha online[% END %] catalog › Your messaging settings</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >index 339aca564b..f28b0e3d5b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › OverDrive search for '[% q | html %]'</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >index 2659751d38..9b8fa402e4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Change your password</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >index f8efc0338c..0427f709a6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% USE Categories %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Forgotten password recovery</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt >index 0dcd80946f..5ac98146c4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% SET consentview = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your consents</title> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >index 45ed6db4f5..0cc6815cfc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your privacy management</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index 70fb5be919..e4d7c00c69 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -2,7 +2,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your checkout history</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >index b3e3210734..a793b1d596 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › RecordedBooks search for '[% q | html %]'</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >index 00a7351265..d9f849638a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt >@@ -1,8 +1,8 @@ > [% USE raw %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => logged_in_user.branchcode ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt >index 72142c6e68..fc457815d2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Please confirm your registration</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt >index fe0d34551a..ba594f7686 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >index 108b04b00d..09da87de2f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Report a problem</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >index 91b0d0470f..82dbc71157 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt >@@ -1,7 +1,7 @@ > [% USE raw %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF ( LibraryNameTitle ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >index 4db9fd92ba..10a29726bd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >@@ -3,7 +3,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your routing lists</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index a941ffd519..8676b3dd19 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -3,7 +3,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your search history</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >index a47569bac0..f660a24e5d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Issues for a subscription</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >index b352398053..84bb7dd13d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Share a list</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index bf91aa1b84..92bbcc1077 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% SET PRIVATE = 1 %] > [% SET PUBLIC = 2 %] > [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >index be91bc8a82..45ee68fd6b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Recent comments</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >index 66be2eda90..5f6533d985 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -6,7 +6,7 @@ > [% USE KohaDates %] > [% USE KohaNews %] > [% SET opacsuggestion = KohaNews.get( location => "OpacSuggestioninstructions", lang => lang, library => branchcode ) %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › > [% IF ( op_add ) %]Enter a new purchase suggestion[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index 941913c04f..9906de45ef 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -2,7 +2,7 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Tags</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >index f756e74592..d7d2831625 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Subject cloud</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >index 4fee23798e..86ba9e1ac1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >@@ -3,7 +3,7 @@ > [% USE AuthorisedValues %] > [% USE ItemTypes %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Most popular titles</title> > [% INCLUDE 'doc-head-close.inc' %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 3748e93534..ed9aa0a6b7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -6,7 +6,7 @@ > [% USE ItemTypes %] > [% USE Price %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %] > [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt >index 6229800f90..b363c02dc2 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt >@@ -21,7 +21,7 @@ > [% END %] > [% END %] > [% PROCESS 'html_helpers.inc' %] >-[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% INCLUDE 'doc-head-open.inc' %] > [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] › Self check-in</title> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >index ee414f3cae..44a1387ece 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt >@@ -1,6 +1,6 @@ > [% USE Koha %] > [% USE KohaNews %] >-[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => branchcode, blocktitle => 0 ) %] >+[% SET OpacNav = KohaNews.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] > [% IF (render=='standalone') %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Search suggestions</title> >diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl >index 77b591bb4e..095130cb63 100755 >--- a/opac/opac-readingrecord.pl >+++ b/opac/opac-readingrecord.pl >@@ -55,8 +55,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > > my $borr = Koha::Patrons->find( $borrowernumber )->unblessed; > >-$template->param(%{$borr}); >- > my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; > > # get the record >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=115760">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24223
:
104362
|
104364
|
104453
|
109856
|
110843
|
110853
|
110897
|
110898
|
113130
|
113131
|
113132
|
115758
|
115759
|
115760
|
124935
|
124936
|
124937
|
124938
|
125300
|
125301
|
125302
|
125303
|
125304
|
125767
|
125768
|
125769
|
125770
|
125771
|
126089
|
126147
|
126484
|
126485
|
126486
|
126487
|
126488
|
126489
|
126490
|
126491
|
126492
|
127338
|
127343
|
127344
|
127345
|
127346