From 25f15d8785913ff5824d149c305bded9031cf5b8 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 6 Feb 2019 13:15:00 +0000
Subject: [PATCH] Bug 21989: [18.05.x] 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
---
 .../prog/en/modules/acqui/addorderiso2709.tt       | 308 ++++++++++-----------
 1 file changed, 152 insertions(+), 156 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 44880f89..6627bcf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -1,7 +1,6 @@
 [% USE Asset %]
 [% USE KohaDates %]
 [% USE Branches %]
-[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Acquisitions &rsaquo; Order staged MARC records
 [% IF ( batch_details ) %]
@@ -11,8 +10,159 @@
 [% END %]
 </title>
 [% Asset.css("css/datatables.css") %]
-<style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
+<style>#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
 [% INCLUDE 'doc-head-close.inc' %]
+[% Asset.js("js/acquisitions-menu.js") %]
+[% INCLUDE 'datatables.inc' %]
+[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
+[% Asset.js("js/acq.js") %]
+<script>
+    $(document).ready(function() {
+        $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
+            "aoColumnDefs": [
+                { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
+                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
+                { "sType": "title-string", "aTargets" : [ "title-string" ] }
+            ],
+            "sPaginationType": "four_button",
+            "aaSorting": []
+        } ) );
+
+        // keep copy of the inactive budgets
+        disabledBudgetsCopy = $("select[name='all_budget_id']").html();
+        $("select[name='all_budget_id'] .b_inactive").remove();
+        $("select[name='budget_id'] .b_inactive").remove();
+
+        $("#showallbudgets").click(function() {
+            if ($(this).is(":checked")) {
+                $("select[name='budget_id']").html(disabledBudgetsCopy)
+            }
+            else {
+                $("select[name='budget_id'] .b_inactive").remove();
+            }
+        });
+
+        $("#all_showallbudgets").click(function() {
+            if ($(this).is(":checked")) {
+                $("select[name='all_budget_id']").html(disabledBudgetsCopy);
+            }
+            else {
+                $("select[name='all_budget_id'] .b_inactive").remove();
+            }
+        });
+
+        $("select[name='budget_id']").change(function(){
+            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
+            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
+            var destination_sort1 = $(this).parents('fieldset').find('li.sort1').find('input[name="sort1"]');
+            var sort1 = $(destination_sort1).val() || "";
+            if ( destination_sort1.length < 1 ) {
+                destination_sort1 = $(this).parents('fieldset').find('li.sort1 > select[name="sort1"]');
+            }
+            var destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('input[name="sort2"]');
+            var sort2 = $(destination_sort2).val() || "";
+            if ( destination_sort2.length < 1 ) {
+                destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('select[name="sort2"]');
+            }
+            getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );
+
+            getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
+        } );
+
+        $("select[name='budget_id']").change();
+
+        $("select[name='all_budget_id']").change(function(){
+            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
+            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
+            var destination_sort1 = $(this).parent().siblings('li').find('input[name="all_sort1"]');
+            if ( destination_sort1.length < 1 ) {
+                destination_sort1 = $(this).parent().siblings('li').find('select[name="all_sort1"]');
+            }
+            var destination_sort2 = $(this).parent().siblings('li').find('input[name="all_sort2"]');
+            if ( destination_sort2.length < 1 ) {
+                destination_sort2 = $(this).parent().siblings('li').find('select[name="all_sort2"]');
+            }
+            getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1 );
+            getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2 );
+            $(this).parent().siblings('li').find('select[name="sort1"]').attr('name', 'all_sort1');
+            $(this).parent().siblings('li').find('input[name="sort1"]').attr('name', 'all_sort1');
+            $(this).parent().siblings('li').find('select[name="sort2"]').attr('name', 'all_sort2');
+            $(this).parent().siblings('li').find('input[name="sort2"]').attr('name', 'all_sort2');
+        } );
+
+        $("select[name='all_budget_id']").change();
+
+        $("#records_to_import fieldset.rows div").hide();
+        $('input:checkbox[name="import_record_id"]').change(function(){
+            var container = $(this).parents("fieldset");
+            if ( $(this).is(':checked') ) {
+                $(container).addClass("selected");
+                $(container).removeClass("unselected");
+                $(container).find("div").toggle(true);
+            } else {
+                $(container).addClass("unselected");
+                $(container).removeClass("selected");
+                $(container).find("div").toggle(false);
+            }
+        } );
+
+        $("input:checkbox").prop("checked", false);
+        $("div.biblio.unselected select").prop('disabled', false);
+        $("div.biblio.unselected input").prop('disabled', false);
+
+        $("#checkAll").click(function(){
+            $("#Aform").checkCheckboxes();
+            $("input:checkbox[name='import_record_id']").change();
+            return false;
+        });
+        $("#unCheckAll").click(function(){
+            $("#Aform").unCheckCheckboxes();
+            $("input:checkbox[name='import_record_id']").change();
+            return false;
+        });
+
+        $("#Aform").on("submit", function(){
+            if ( $("input:checkbox[name='import_record_id']:checked").length < 1 ) {
+                alert(_("There is no record selected"));
+                return false;
+            }
+
+            var error = 0;
+            $("input:checkbox[name='import_record_id']:checked").parents('fieldset').find('input[name="quantity"]').each(function(){
+                if ( $(this).val().length < 1 || isNaN( $(this).val() ) ) {
+                    error++;
+                }
+            });
+            if ( error > 0 ) {
+                alert(error + " " + _("quantity values are not filled in or are not numbers"));
+                return false;
+
+            }
+
+            return disableUnchecked($(this));
+        });
+        $('#tabs').tabs();
+        $(".previewData").on("click", function(e){
+            e.preventDefault();
+            var ltitle = $(this).text();
+            var page = $(this).attr("href");
+            $("#dataPreviewLabel").text(ltitle);
+            $("#dataPreview .modal-body").load(page + " div");
+            $('#dataPreview').modal({show:true});
+        });
+        $("#dataPreview").on("hidden.bs.modal", function(){
+            $("#dataPreviewLabel").html("");
+            $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
+        });
+    });
+
+    function disableUnchecked(form){
+        $("fieldset.biblio.unselected").each(function(){
+            $(this).remove();
+        });
+        return 1;
+    }
+</script>
 </head>
 
 <body id="acq_addorderiso2709" class="acq">
@@ -425,158 +575,4 @@
    </div>
 </div>
 
-[% MACRO jsinclude BLOCK %]
-    [% Asset.js("js/acquisitions-menu.js") %]
-[% INCLUDE 'datatables.inc' %]
-    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
-    [% Asset.js("js/acq.js") %]
-    <script type="text/JavaScript">
-        $(document).ready(function() {
-            $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
-                "aoColumnDefs": [
-                    { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
-                    { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
-                    { "sType": "title-string", "aTargets" : [ "title-string" ] }
-                ],
-                "sPaginationType": "four_button",
-                "aaSorting": []
-            } ) );
-
-            // keep copy of the inactive budgets
-            disabledBudgetsCopy = $("select[name='all_budget_id']").html();
-            $("select[name='all_budget_id'] .b_inactive").remove();
-            $("select[name='budget_id'] .b_inactive").remove();
-
-            $("#showallbudgets").click(function() {
-                if ($(this).is(":checked")) {
-                    $("select[name='budget_id']").html(disabledBudgetsCopy)
-                }
-                else {
-                    $("select[name='budget_id'] .b_inactive").remove();
-                }
-            });
-
-            $("#all_showallbudgets").click(function() {
-                if ($(this).is(":checked")) {
-                    $("select[name='all_budget_id']").html(disabledBudgetsCopy);
-                }
-                else {
-                    $("select[name='all_budget_id'] .b_inactive").remove();
-                }
-            });
-
-            $("select[name='budget_id']").change(function(){
-                var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
-                var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
-                var destination_sort1 = $(this).parents('fieldset').find('li.sort1').find('input[name="sort1"]');
-                var sort1 = $(destination_sort1).val() || "";
-                if ( destination_sort1.length < 1 ) {
-                    destination_sort1 = $(this).parents('fieldset').find('li.sort1 > select[name="sort1"]');
-                }
-                var destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('input[name="sort2"]');
-                var sort2 = $(destination_sort2).val() || "";
-                if ( destination_sort2.length < 1 ) {
-                    destination_sort2 = $(this).parents('fieldset').find('li.sort2').find('select[name="sort2"]');
-                }
-                getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );
-
-                getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
-            } );
-
-            $("select[name='budget_id']").change();
-
-            $("select[name='all_budget_id']").change(function(){
-                var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
-                var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
-                var destination_sort1 = $(this).parent().siblings('li').find('input[name="all_sort1"]');
-                if ( destination_sort1.length < 1 ) {
-                    destination_sort1 = $(this).parent().siblings('li').find('select[name="all_sort1"]');
-                }
-                var destination_sort2 = $(this).parent().siblings('li').find('input[name="all_sort2"]');
-                if ( destination_sort2.length < 1 ) {
-                    destination_sort2 = $(this).parent().siblings('li').find('select[name="all_sort2"]');
-                }
-                getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1 );
-                getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2 );
-                $(this).parent().siblings('li').find('select[name="sort1"]').attr('name', 'all_sort1');
-                $(this).parent().siblings('li').find('input[name="sort1"]').attr('name', 'all_sort1');
-                $(this).parent().siblings('li').find('select[name="sort2"]').attr('name', 'all_sort2');
-                $(this).parent().siblings('li').find('input[name="sort2"]').attr('name', 'all_sort2');
-            } );
-
-            $("select[name='all_budget_id']").change();
-
-            $("#records_to_import fieldset.rows div").hide();
-            $('input:checkbox[name="import_record_id"]').change(function(){
-                var container = $(this).parents("fieldset");
-                if ( $(this).is(':checked') ) {
-                    $(container).addClass("selected");
-                    $(container).removeClass("unselected");
-                    $(container).find("div").toggle(true);
-                } else {
-                    $(container).addClass("unselected");
-                    $(container).removeClass("selected");
-                    $(container).find("div").toggle(false);
-                }
-            } );
-
-            $("input:checkbox").prop("checked", false);
-            $("div.biblio.unselected select").prop('disabled', false);
-            $("div.biblio.unselected input").prop('disabled', false);
-
-            $("#checkAll").click(function(){
-                $("#Aform").checkCheckboxes();
-                $("input:checkbox[name='import_record_id']").change();
-                return false;
-            });
-            $("#unCheckAll").click(function(){
-                $("#Aform").unCheckCheckboxes();
-                $("input:checkbox[name='import_record_id']").change();
-                return false;
-            });
-
-            $("#Aform").on("submit", function(){
-                if ( $("input:checkbox[name='import_record_id']:checked").length < 1 ) {
-                    alert(_("There is no record selected"));
-                    return false;
-                }
-
-                var error = 0;
-                $("input:checkbox[name='import_record_id']:checked").parents('fieldset').find('input[name="quantity"]').each(function(){
-                    if ( $(this).val().length < 1 || isNaN( $(this).val() ) ) {
-                        error++;
-                    }
-                });
-                if ( error > 0 ) {
-                    alert(error + " " + _("quantity values are not filled in or are not numbers"));
-                    return false;
-
-                }
-
-                return disableUnchecked($(this));
-            });
-            $('#tabs').tabs();
-            $(".previewData").on("click", function(e){
-                e.preventDefault();
-                var ltitle = $(this).text();
-                var page = $(this).attr("href");
-                $("#dataPreviewLabel").text(ltitle);
-                $("#dataPreview .modal-body").load(page + " div");
-                $('#dataPreview').modal({show:true});
-            });
-            $("#dataPreview").on("hidden.bs.modal", function(){
-                $("#dataPreviewLabel").html("");
-                $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
-            });
-        });
-
-        function disableUnchecked(form){
-            $("fieldset.biblio.unselected").each(function(){
-                $(this).remove();
-            });
-            return 1;
-        }
-    </script>
-[% END %]
-
 [% INCLUDE 'intranet-bottom.inc' %]
-- 
2.1.4