From 257ee57c80eb4a3dfe8bcdbb9687032199058eee Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 7 Jul 2022 12:39:01 +0100 Subject: [PATCH] Bug 31116: Add circulation sidebar to article requests This patch adds the circulation sidebar menu to the article requests page to make it consistent with other circulation module pages. Test plan 1) Prior to applying the patch confirm that there is no sidebar on the article requests management page, regardless of the CircSidebar perference. 2) Apply the patch 3) Confirm there is still no sidebar when CircSidebar is disabled 4) Confirm there is now a sidebar present when CircSidebar is enabled 5) Confirm the current page is highlighted correctly in the sidebar when on the article requests page. Signed-off-by: David Nind Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- .../intranet-tmpl/prog/en/includes/circ-nav.inc | 7 +++++++ .../prog/en/modules/circ/article-requests.tt | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc index 99b882c76a..01631fecce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -32,6 +32,13 @@ [% END %] + [% IF Koha.Preference('ArticleRequests') %] +
Patron request
+ + [% END %] +
Circulation reports
  • Holds queue
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index d453a7de33..c120615041 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -1,8 +1,10 @@ [% USE KohaDates %] +[% USE Koha %] [% USE ItemTypes %] [% USE Branches %] [% USE AuthorisedValues %] [% USE Asset %] +[% USE Koha %] [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -148,7 +150,12 @@
    -
    + + [% IF Koha.Preference('CircSidebar') %] +
    + [% ELSE %] +
    + [% END %]

    Article requests

    [% PROCESS urls_modal %] @@ -511,6 +518,14 @@
    + + [% IF Koha.Preference('CircSidebar') %] +
    + +
    + [% END %]
    [% PROCESS cancel_modal %] -- 2.39.5