From ee299e4b863de61ceb6f515ccb21fc4ec43e8a7a Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 30 Mar 2026 12:58:13 +0200
Subject: [PATCH] Bug 42282: Tidy all script tags - catalogue

In order to tidy all the script tags of the .tt files we isolate the
interpolation of Template::Toolkit variables in a separate script tag.

This patch focuses on the catalogue module.

The 7 main changes are in the following files:
* ISBDdetail.tt
* MARCdetail.tt
* detail.tt
* imageviewer.tt
* labeledMARCdetail.tt
* moredetail.tt
* stockrotation.tt

Several identical changes (logged_in_user_borrowernumber, searchid,
biblio_id, browser, etc.)
detail.tt needs to be tested a bit more thoroughly but the changes are
still trivial.

Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Jan Kissig <bibliothek@th-wildau.de>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
---
 .../prog/en/modules/catalogue/ISBDdetail.tt   |  12 +-
 .../prog/en/modules/catalogue/MARCdetail.tt   |  14 +-
 .../prog/en/modules/catalogue/advsearch.tt    |   2 +-
 .../prog/en/modules/catalogue/detail.tt       | 152 ++++++++++--------
 .../prog/en/modules/catalogue/imageviewer.tt  |  18 ++-
 .../prog/en/modules/catalogue/issuehistory.tt |   2 +-
 .../prog/en/modules/catalogue/itemsearch.tt   |   2 +-
 .../en/modules/catalogue/labeledMARCdetail.tt |  18 ++-
 .../prog/en/modules/catalogue/moredetail.tt   |  13 +-
 .../prog/en/modules/catalogue/results.tt      |   2 +-
 .../prog/en/modules/catalogue/showelastic.tt  |   2 +-
 .../en/modules/catalogue/stockrotation.tt     |   7 +-
 12 files changed, 144 insertions(+), 100 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
index d08d7ae73a..3474d4f540 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tt
@@ -91,15 +91,17 @@
     [% END %]
 
     [% Asset.js("js/browser.js") | $raw %]
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        /* Set a variable needed by add_catalog_concern.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+        var searchid = "[% searchid | html %]";
+        var biblio_id = parseInt('[% biblionumber| html %]', 10);
+    </script>
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            /* Set a variable needed by add_catalog_concern.js */
-            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
-        </script>
         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
     [% END %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
+        var browser = KOHA.browser(searchid, biblio_id);
         browser.show();
     </script>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
index 6a12ccf5cd..6551302abe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
@@ -215,15 +215,17 @@
     [% END %]
 
     [% Asset.js("js/browser.js") | $raw %]
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        /* Set a variable needed by add_catalog_concern.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+        var searchid = "[% searchid | html %]";
+        var biblio_id = parseInt('[% biblionumber | html %]', 10);
+    </script>
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            /* Set a variable needed by add_catalog_concern.js */
-            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
-        </script>
         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
     [% END %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
+        var browser = KOHA.browser(searchid, biblio_id);
         browser.show();
 
          $(document).ready(function() {
@@ -237,7 +239,7 @@
 
         function Changefwk(FwkList) {
             var fwk = FwkList.options[FwkList.selectedIndex].value;
-            window.location = "MARCdetail.pl?biblionumber=[% biblionumber | html %]&frameworkcode="+fwk;
+            window.location = `MARCdetail.pl?biblionumber=${biblio_id}&frameworkcode=${fwk}`;
         }
     </script>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index b732e9742a..6dcb6ad85b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -401,7 +401,7 @@
     [% Asset.js("js/browser.js") | $raw %]
     [% Asset.css("css/humanmsg.css") | $raw %]
     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         /**
          *  Function add_field();
          *  This function allows to display a new field to search.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 500177487f..cd76175a42 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -1285,18 +1285,66 @@
     [%# can_edit_items_from item_type_image_locations %]
     [% PROCESS build_items_table_js biblio => biblio %]
 
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        /* Set a variable needed by add_catalog_concern.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+
+        var searchid = "[% searchid | html %]";
+        var biblio_id = parseInt('[% biblionumber | html %]', 10);
+
+        var interface = "[% interface | html %]";
+        var theme = "[% theme | html %]";
+        var all_items_count = [% count || 0 | html %];
+
+        const activetab = "[% activetab | html %]";
+        const has_component_parts = [% ComponentParts && ComponentParts.size ? 1 : 0 | html %];
+        const show_holdings_panel = [% items_to_display_count - ( other_holdings_count || 0 ) ? 1 : 0 | html %]
+
+        const normalized_isbn = "[% normalized_isbn | html %]";
+        const normalized_upc = "[% normalized_upc | html %]";
+
+        [% IF ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) %]
+            var concerns_table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'concerns', 'table_concerns', 'json' ) | $raw %];
+        [% END %]
+
+        [% IF Koha.Preference('AcquisitionDetails') %]
+            var acquisitiondetails_table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'acquisitiondetails-table', 'json') | $raw %];
+        [% END %]
+
+        [% IF reviews %]
+            var comment_table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'comments-table', 'json') | $raw %];
+        [% END %]
+
+        [% IF bundlesEnabled %]
+            var bundle_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail','bundle_tables','json') | $raw %];
+        [% END %]
+
+        const bundlesEnabled = [% bundlesEnabled ? 1 : 0 | html %];
+
+        Koha.addPrefs({
+            AlwaysShowHoldingsTableFilters: [% Koha.Preference('AlwaysShowHoldingsTableFilters') ? 1 : 0 | html %],
+            BundleLostValue: "[% Koha.Preference('BundleLostValue') | html %]",
+            CoceHost: "[% Koha.Preference('CoceHost') | html %]",
+            CoceProviders: "[% Koha.Preference('CoceProviders') | html %]",
+            HTML5MediaEnabled: "[% HTML5MediaEnabled | html %]",
+            KohaAdminEmailAddress: "[% KohaAdminEmailAddress | uri %]",
+            IntranetCoce: [% Koha.Preference('IntranetCoce') ? 1 : 0 | html %],
+            NovelistSelectStaffEnabled: [% Koha.Preference('NovelistSelectStaffEnabled') ? 1 : 0 | html %],
+            NovelistSelectStaffProfile: "[% Koha.Preference('NovelistSelectStaffProfile') | html %]",
+            NovelistSelectPassword: "[% Koha.Preference('NovelistSelectPassword') | html %]",
+            SearchEngine: "[% Koha.Preference('SearchEngine') | html %]",
+        });
+
+        Koha.addPermissions({
+            CAN_user_editcatalogue_manage_item_groups: [% CAN_user_editcatalogue_manage_item_groups ? 1 : 0 | html %],
+            CAN_user_tools_upload_local_cover_images: [% CAN_user_tools_upload_local_cover_images ? 1 : 0 | html %],
+        });
+    </script>
+
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            /* Set a variable needed by add_catalog_concern.js */
-            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
-        </script>
         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
     [% END %]
     [% IF ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            var table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'concerns', 'table_concerns', 'json' ) | $raw %];
-            const biblio_id = "[% biblionumber | html %]";
-        </script>
         <script nonce="[% Koha.CSPNonce | $raw %]">
             $(document).ready(function () {
                 $("#bibliodetails a:first").tab("show");
@@ -1458,7 +1506,7 @@
                             },
                         ],
                     },
-                    table_settings,
+                    concerns_table_settings,
                     0,
                     additional_filters,
                     undefined,
@@ -1479,8 +1527,6 @@
         [% Asset.js("js/modals/display_ticket.js") | $raw %]
     [% END # /IF CatalogConcerns %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        var interface = "[% interface | html %]";
-        var theme = "[% theme | html %]";
         // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
         function verify_cover_images(container) {
             // Loop over each container in the template which contains covers
@@ -1625,32 +1671,32 @@
         function showNoImageMessage() {
             var no_images_msg = _("No images have been uploaded for this bibliographic record yet.");
             no_images_msg = '<p>' + no_images_msg + '</p>';
-            [% IF ( CAN_user_tools_upload_local_cover_images ) %]
-                var please_upload = _("Upload an image file: %sUpload%s").format("<a class='btn btn-default btn-xs' href='/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=" + biblionumber + "&amp;filetype=image'><i class='fa fa-upload' aria-hidden='true'></i> ","</a>");
+            if (Koha.permissions.CAN_user_tools_upload_local_cover_images ) {
+                var please_upload = _("Upload an image file: %sUpload%s").format("<a class='btn btn-default btn-xs' href='/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=" + biblio_id + "&amp;filetype=image'><i class='fa fa-upload' aria-hidden='true'></i> ","</a>");
                 no_images_msg += "<p id='upload_image'>" + please_upload + '</p>';
-            [% END %]
+            }
             $('#images').html(no_images_msg);
         }
 
         $(document).ready(function() {
             // Pick details tab to display by default
-            [% IF activetab == "comments" %]
+            if (activetab == "comments" ){
                 $("#bibliodetails a[href='#comments_panel']").tab("show");
-            [% ELSIF count == 0 %]
-                [% IF ( Koha.Preference('HTML5MediaEnabled') == 'staff' or Koha.Preference('HTML5MediaEnabled') == 'both' ) && HTML5MediaSets.size %]
+            } else if (all_items_count == 0){
+                if ((Koha.prefs.HTML5MediaEnabled == 'staff' || Koha.prefs.HTML5MediaEnabled == 'both' ) && HTML5MediaSets.size ){
                     $("#bibliodetails a[href='#html5media_panel']").tab("show");
-                [% ELSIF ComponentParts && ComponentParts.size %]
+                } else if (has_component_parts){
                     $("#bibliodetails a[href='#components_panel']").tab("show");
-                [% ELSE %]
+                } else {
                     $("#bibliodetails a[href='#holdings_panel']").tab("show");
-                [% END %]
-            [% ELSE %]
-                [% IF items_to_display_count - ( other_holdings_count || 0 ) %]
+                }
+            } else {
+                if (show_holdings_panel ) {
                     $("#bibliodetails a[href='#holdings_panel']").tab("show");
-                [% ELSE %]
+                } else {
                     $("#bibliodetails a[href='#otherholdings_panel']").tab("show");
-                [% END %]
-            [% END %]
+                }
+            }
             $('#search-form').focus();
             $('.thumbnails > li > .remove').click(function() {
                 var result = confirm(_("Are you sure you want to delete this cover image?"));
@@ -1662,9 +1708,9 @@
 
                 return false;
             });
-            [% IF ( IntranetCoce && CoceProviders ) %]
-                KOHA.coce.getURL('[% CoceHost | html %]', '[% CoceProviders | html %]');
-            [% END %]
+            if (Koha.prefs.IntranetCoce && Koha.prefs.CoceProviders){
+                KOHA.coce.getURL(Koha.prefs.CoceHost, Koha.prefs.CoceProviders);
+            }
 
             $("body").on("click",".previewMARC", function(e){
                 e.preventDefault();
@@ -1674,33 +1720,33 @@
 
             });
 
-            [% IF ( Koha.Preference('SearchEngine') == 'Elasticsearch' ) %]
+            if (Koha.prefs.SearchEngine == 'Elasticsearch' ){
                 $("body").on("click",".previewElastic", function(e){
                     e.preventDefault();
                     var pageElastic = $(this).attr("href");
                     $("#elasticPreview .modal-body").load(pageElastic, function( response, status, xhr ) {
                         if( status == 'error' ){
-                            $("#elasticPreview .modal-body").html("<h1>"+_("An error has occurred!")+"</h1><h2><em>"+_("Error 404")+"</em></h2><ul><li>"+_("An internal link in the staff interface is broken and the page does not exist")+"</li></ul><h3>"+_("What's next?")+"</h3><ul style='margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;'><li>"+_("Use top menu bar to navigate to another part of Koha.")+"</li><li>"+_("To report a broken link or any other issue, please contact the Koha administrator.")+" <a href='mailto:[% Koha.Preference("KohaAdminEmailAddress") | uri %]'>"+_("Send email")+"</a></li></ul>");
+                            $("#elasticPreview .modal-body").html("<h1>"+_("An error has occurred!")+"</h1><h2><em>"+_("Error 404")+"</em></h2><ul><li>"+_("An internal link in the staff interface is broken and the page does not exist")+"</li></ul><h3>"+_("What's next?")+"</h3><ul style='margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;'><li>"+_("Use top menu bar to navigate to another part of Koha.")+"</li><li>"+_("To report a broken link or any other issue, please contact the Koha administrator.")+" <a href='mailto: + Koha.prefs.KohaAdminEmailAddress'>"+_("Send email")+"</a></li></ul>");
                         }
                     });
                     $('#elasticPreview').modal("show");
                 });
-            [% END %]
+            }
 
-            [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && ( normalized_isbn || normalized_upc ) ) %]
+            if (Koha.prefs.NovelistSelectStaffEnabled && Koha.prefs.NovelistSelectStaffProfile && ( normalized_isbn || normalized_upc ) ){
                 novSelect.loadContentForQuery({
-                    ClientIdentifier : '[% IF normalized_isbn %][% normalized_isbn | html %][% ELSE %][% normalized_upc | html %][% END %]',
-                    ISBN : '[% IF normalized_isbn %][% normalized_isbn | html %][% ELSE %][% normalized_upc | html %][% END %]',
+                    ClientIdentifier : normalized_isbn || normalized_upc,
+                    ISBN : normalized_isbn || normalized_upc,
                     version : '2.1'
                 },
-                '[% Koha.Preference('NovelistSelectStaffProfile') | html %]',
-                '[% Koha.Preference('NovelistSelectPassword') | html %]',
+                Koha.prefs.NovelistSelectStaffProfile,
+                Koha.prefs.NovelistSelectPassword,
                 function(d){
                     if ( d.length > 0 ){ //If no content
                         $(".NovelistSelect").show();
                     }
                  });
-            [% END %]
+            }
             $(".cover-slider").on("click",".cover-nav", function(e){
                 e.preventDefault();
                 var cover_slider = $(this).parent();
@@ -1714,7 +1760,7 @@
         });
 
 
-        [% IF ( IntranetCoce && CoceProviders ) %]
+        if(Koha.prefs.IntranetCoce && Koha.prefs.CoceProviders ){
             let counter_wait = 0;
             function wait_for_images(cb){
 
@@ -1738,11 +1784,11 @@
             $(window).load(function() {
                 wait_for_images(verify_cover_images);
             });
-        [% ELSE %]
+        } else {
             $(window).load(function() {
                 verify_cover_images();
             });
-        [% END # /IF IntranetCoce %]
+        }
     </script>
     [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && ( normalized_isbn || normalized_upc ) ) %]
         <script src="https://imageserver.ebscohost.com/novelistselect/ns2init.js">
@@ -1764,25 +1810,11 @@
     [% IF Koha.Preference('EnableBooking') %]
         [% Asset.js("js/modals/place_booking.js") | $raw %]
     [% END %]
+
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        var browser;
-        browser = KOHA.browser("[% searchid | html %]", parseInt(biblionumber, 10));
+        var browser = KOHA.browser(searchid, biblio_id);
         browser.show();
 
-        [% IF bundlesEnabled %]
-            var bundle_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail','bundle_tables','json') | $raw %];
-        [% END %]
-
-        Koha.addPrefs({
-            AlwaysShowHoldingsTableFilters: [% Koha.Preference('AlwaysShowHoldingsTableFilters') ? 1 : 0 | html %],
-            BundleLostValue: "[% Koha.Preference('BundleLostValue') | html %]",
-        });
-
-        Koha.addPermissions({
-            CAN_user_editcatalogue_manage_item_groups: [% CAN_user_editcatalogue_manage_item_groups ? 1 : 0 | html %],
-        });
-    </script>
-    <script nonce="[% Koha.CSPNonce | $raw %]">
         let items_tab_ids = ["holdings", "otherholdings"];
         items_tab_ids.forEach(function (tab_id, index) {
             // Early return if the tab is not shown (ie. no table)
@@ -2136,9 +2168,6 @@
         }
     </script>
     [% IF Koha.Preference('AcquisitionDetails') %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            var table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'acquisitiondetails-table', 'json') | $raw %];
-        </script>
         <script nonce="[% Koha.CSPNonce | $raw %]">
             $(document).ready(function () {
                 var acquisitiondetails_table = $("#orders").kohaTable(
@@ -2148,7 +2177,7 @@
                         autoWidth: false,
                         order: [[4, "desc"]],
                     },
-                    table_settings
+                    acquisitiondetails_table_settings
                 );
             });
         </script>
@@ -2165,9 +2194,6 @@
     [% END %]
 
     [% IF ( reviews ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            var comment_table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'comments-table', 'json') | $raw %];
-        </script>
         <script nonce="[% Koha.CSPNonce | $raw %]">
             $(document).ready(function () {
                 var comments_table = $("#comments_table").kohaTable(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
index 7054f7f9ab..fd37bf4978 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt
@@ -144,18 +144,22 @@
         [% Asset.js("js/modals/place_booking.js") | $raw %]
     [% END %]
 
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        /* Set a variable needed by add_catalog_concern.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+
+        var interface = "[% interface | html %]";
+        var theme = "[% theme | html %]";
+
+        const imagenumber = [% imagenumber | html %];
+    </script>
+
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            /* Set a variable needed by add_catalog_concern.js */
-            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
-        </script>
         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
     [% END %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        var interface = "[% interface | html %]";
-        var theme = "[% theme | html %]";
         $(document).ready(function(){
-            showCover([% imagenumber | html %]);
+            showCover(imagenumber);
             $(".show_cover").on("click",function(e){
                 e.preventDefault();
                 if( $(this).find("img").hasClass("selected") ){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
index 08729ef17c..07104a71b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
@@ -127,7 +127,7 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         var table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'checkoutshistory-table', 'json') | $raw %];
         [% UNLESS show_patron_column %]
             // Remove the patron column definition
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 30b8cc87d4..13ceab0dcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -397,7 +397,7 @@
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'select2.inc' %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         var authorised_values = [% authorised_values_json | $raw %];
         var table_settings = [% TablesSettings.GetTableSettings( 'catalogue', 'itemsearch', 'results', 'json' ) | $raw %];
         Koha.addPermissions({
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
index 8056eac4c5..a6cc0ed3c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt
@@ -104,17 +104,20 @@
         [% Asset.js("js/modals/place_booking.js") | $raw %]
     [% END %]
 
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        /* Set a variable needed by add_catalog_concern.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+        var searchid = "[% searchid | html %]";
+        var biblio_id = parseInt('[% biblionumber | html %]', 10);
+    </script>
+
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            /* Set a variable needed by add_catalog_concern.js */
-            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
-        </script>
         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
     [% END %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        //<![CDATA[
-            var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
+            var browser = KOHA.browser(searchid, biblio_id);
             browser.show();
+
             $(document).ready(function() {
                 $("#Frameworks").on("change",function(){
                     Changefwk(this);
@@ -123,9 +126,8 @@
             function Changefwk(FwkList)
             {
                 var fwk = FwkList.options[FwkList.selectedIndex].value;
-                window.location = "labeledMARCdetail.pl?biblionumber=[% biblionumber | html %]&frameworkcode="+fwk;
+                window.location = `labeledMARCdetail.pl?biblionumber=${biblio_id}&frameworkcode=${fwk}`;
             }
-        //]]>
     </script>
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
index 3d93fa27b6..24753a2577 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
@@ -602,16 +602,19 @@
         [% Asset.js("js/modals/place_booking.js") | $raw %]
     [% END %]
 
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        /* Set a variable needed by add_catalog_concern.js */
+        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
+        var searchid = "[% searchid | html %]";
+        var biblio_id = parseInt('[% biblionumber | html %]', 10);
+    </script>
+
     [% IF ( Koha.Preference('CatalogConcerns') ) %]
-        <script nonce="[% Koha.CSPNonce | $raw %]">
-            /* Set a variable needed by add_catalog_concern.js */
-            var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
-        </script>
         [% Asset.js("js/modals/add_catalog_concern.js") | $raw %]
     [% END %]
     <script nonce="[% Koha.CSPNonce | $raw %]">
         $(document).ready(function(){
-            var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
+            var browser = KOHA.browser(searchid, biblio_id);
             browser.show();
 
             $(".item_sublink").on("click", function () {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 417bf83005..de540dcfaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -980,7 +980,7 @@
     [% Asset.css("css/humanmsg.css") | $raw %]
     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
     [% INCLUDE 'select2.inc' %]
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         var PREF_AmazonCoverImages = parseInt( "[% Koha.Preference('AmazonCoverImages') | html %]", 10);
         var q_array = new Array();  // will hold search terms, if present
         var PREF_IntranetCoce = parseInt( "[% Koha.Preference('IntranetCoce') | html %]", 10);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt
index 4ae69af605..f8fb3b6f47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/showelastic.tt
@@ -19,7 +19,7 @@
             resize: none;
         }
     </style>
-    <script nonce="[% Koha.CSPNonce | $raw %]">
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
         display();
 
         function display() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
index dc4ebc4923..38c82250fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt
@@ -192,8 +192,13 @@
 
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/browser.js") | $raw %]
+    <script nonce="[% Koha.CSPNonce | $raw %]" data-tt-allowed="true">
+        var searchid = "[% searchid | html %]";
+        var biblio_id = parseInt('[% biblionumber | html %]', 10);
+    </script>
+
     <script nonce="[% Koha.CSPNonce | $raw %]">
-        var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
+        var browser = KOHA.browser(searchid, biblio_id);
         browser.show();
     </script>
 [% END %]