From 7127a7908e6ce1743ad64a23c265a0119fce9ffe Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 14 Jan 2019 14:17:23 +0000 Subject: [PATCH] Bug 21989: JS error in "Add orders from MARC file" - addorderiso2709.pl This patch undoes the changes to addorderiso2709.tt introduced by Bug 19753. 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: Maryse Simard Signed-off-by: Katrin Fischer --- .../prog/en/modules/acqui/addorderiso2709.tt | 182 ++++++++++----------- 1 file changed, 89 insertions(+), 93 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 26c3ecfe57..69264aeac0 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 ) %] @@ -12,8 +11,96 @@ [% END %] [% Asset.css("css/datatables.css") | $raw %] - + [% INCLUDE 'doc-head-close.inc' %] + [% 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 %] + @@ -425,95 +512,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 %] - -[% END %] - [% INCLUDE 'intranet-bottom.inc' %] -- 2.11.0