From ab3e4095fe963f597c6fe0e0e939b7849b9d6b2d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 16 Nov 2022 12:10:16 +0000
Subject: [PATCH] Bug 34180: Template variable in JavaScript prevents authority
 MARC preview from displaying

Since template variables cannot be processed by JS, we must use a
template to declare a JS variable which the JS file can used. This patch
corrects this problem in the JS file which handles display of the
authority MARC preview from the authority search results page.

To test, apply the patch and go to Authorities.

- Perform a search which will return multiple authority results.
- Click "Actions -> MARC preview." The preview should display correctly.
- Click "Actions -> MARC preview" on another search result. This preview
  should also look correct.
- There should be no JavaScript errors in the browser console.

Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6d433ffa8931487c967ec01c483e9bb13eb5700b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 955d3a53e7c1c3a29c82d7fb8754875559c05c32)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/authorities-detail-modal.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
index 67d0eb6395..152feed293 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc
@@ -88,8 +88,8 @@ $(document).ready(function () {
             $("#header_search a[href='#entire_record']").tab("show");
         }
     }
-
 });
+const template_path = "[% interface | html %]/[% theme | html %]";
 
 </script>
 <!-- / authorities_js.inc -->
diff --git a/koha-tmpl/intranet-tmpl/prog/js/authorities-detail-modal.js b/koha-tmpl/intranet-tmpl/prog/js/authorities-detail-modal.js
index a53a53de38..d91b047258 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/authorities-detail-modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/authorities-detail-modal.js
@@ -1,3 +1,4 @@
+/* global template_path */
 $(document).ready(function(){
     $(".authority_preview a").on("click", function(e){
         e.preventDefault();
@@ -17,6 +18,6 @@ $(document).ready(function(){
     });
     $("#authorityDetail").on("hidden.bs.modal", function(){
         $("#authorityDetail .modal-body, #authorityDetail .modal-title").html("");
-        $("#authorityDetail .modal-body").html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /></div>");
+        $("#authorityDetail .modal-body").html("<img src=\"" + template_path + "/img/spinner-small.gif\" alt=\"\" />");
     });
 });
-- 
2.39.5