From eac9f6d3b471e50ef573368e72e22e7acb01e474 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 14 May 2020 11:47:51 +0000 Subject: [PATCH] Bug 25473: Move JavaScript out of the footer of addorderiso2709.tt This patch undoes the move of the JavaScript block to the footer made in Bug 22734. The item information tab can include embedded JavaScript for cataloging plugins, and these don't currently work with JS in the footer. To test, apply the patch and test the JavaScript driven features of the "Add to basket from a staged file" page: - Acquisitions -> Vendor -> Basket -> Add to basket from a staged file - MARC and Card previews, select all/clear all - Item information tab: Cataloging plugins for fields like date acquired, barcode - Default accounting details tab: Show inactive control Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 9e665fb9a753032fed711959f1d8cc5780655b8c) (cherry picked from commit 04fc143d25f743b9d58c6fd1f28ba1d9cd0216cb) Signed-off-by: Victor Grousset/tuxayo --- .../prog/en/modules/acqui/addorderiso2709.tt | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index a522f70c79..0e07f20cff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -2,7 +2,6 @@ [% USE Asset %] [% USE KohaDates %] [% USE Branches %] -[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Order staged MARC records [% IF ( batch_details ) %] @@ -13,6 +12,19 @@ [% INCLUDE 'doc-head-close.inc' %] +[%# As long as cataloging plugins rely on @@ -432,20 +444,4 @@ [% # /div.col-sm-6 %] [% # /div.row %] - -[% MACRO jsinclude BLOCK %] - [% Asset.js("js/acquisitions-menu.js") | $raw %] - [% INCLUDE 'datatables.inc' %] - [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] - [% Asset.js("js/acq.js") | $raw %] - [% Asset.js("js/funds_sorts.js") | $raw %] - [% Asset.js("js/addorderiso2709.js") | $raw %] - -[% END %] - [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5