From cf67e0617c1be9185bd4854455a5478f13805363 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 24 Dec 2020 00:07:04 +0000 Subject: [PATCH] Bug 27031: Use Koha.Preference() more often in header.inc and js_includes.inc This patch uses the Koha.Preference() macro more often in key includes. (In the longer term, it will help reduce dependency in problematic C4::Auth code.) Test plan: 0. Apply patch 1. Go to http://localhost:8081/cgi-bin/koha/mainpage.pl 2. Note "Cart" link in nav bar 3. Click "Cart" and note "Your cart is currently empty" text 4. Click "More" and note "Course Reserves" in dropdown menu 5. Go to http://localhost:8081/cgi-bin/koha/catalogue/search.pl?q=test 6. Click "Select all" above search results 7. Click "Add to cart" 8. Note "Cart" now has 3 displaying next to it 9. Click "Cart" 10. Note there are three titles in the cart 11. Click "Empty and close" and click "OK" to confirm 12. Note "Cart (0)" now appears in the top nav 13. Go to http://localhost:8081/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=IntranetNav 14. Save the following content in the system preference:
  • New Home
    • 15. Refresh the page 16. Note "New Home" appears in the top nav between "Cart" and "More" Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 4186a5873bdeca5b57b153f07494d800ca93cb8b) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 1b453b874f..12deaa80ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -23,12 +23,12 @@
  • Item search
    • [% END %] - [% IF ( intranetbookbag ) %] + [% IF ( Koha.Preference('intranetbookbag') ) %]
  • Cart
    • [% END %] - [% IntranetNav | $raw %] + [% Koha.Preference('IntranetNav') | $raw %]
  • More
      @@ -46,7 +46,7 @@ [% IF ( CAN_user_serials ) %]
    • Serials
      • [% END %] - [% IF ( UseCourseReserves ) %] + [% IF ( Koha.Preference('UseCourseReserves') ) %]
    • Course reserves
      • [% END %] [% IF ( CAN_user_reports ) %] @@ -205,6 +205,6 @@
    [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %] - [% IF ( intranetbookbag ) %]
    Your cart is empty.
    [% END %] + [% IF ( Koha.Preference('intranetbookbag') ) %]
    Your cart is empty.
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index b354113549..b832eec518 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -2,6 +2,7 @@ [% USE Asset %] [% USE AudioAlerts %] [% USE To %] +[% USE Koha %] [%# Prevent XFS attacks -%] [% UNLESS popup %]