From 78b5cd20158b217728383bf5a69db4a3fd535ef7 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 6 May 2021 08:23:46 +0100
Subject: [PATCH] Bug 14957: (QA follow-up) Fix for jQuery undefined

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../en/modules/admin/marc-overlay-rules.tt    | 65 ++++++++++---------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
index a2d892e226..0f767e3940 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
@@ -5,8 +5,6 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>MARC overlay rules &rsaquo; Koha &rsaquo; Administration</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css("css/datatables.css") | $raw %]
-[% INCLUDE 'datatables.inc' %]
 
 <style>
     .required {
@@ -267,46 +265,49 @@
     </div><!-- /main container-fluid -->
 
 [% MACRO jsinclude BLOCK %]
-    <script>
-    function doSubmit(op, id) {
-        $('<input type="hidden"/>')
-        .attr('name', 'op')
-        .attr('value', op)
-        .appendTo('#marc-overlay-rules-form');
+    [% Asset.js("js/admin-menu.js") | $raw %]
+    [% INCLUDE 'datatables.inc' %]
 
-        if(id) {
+    <script>
+    $(document).ready(function(){
+        function doSubmit(op, id) {
             $('<input type="hidden"/>')
-            .attr('name', 'id')
-            .attr('value', id)
+            .attr('name', 'op')
+            .attr('value', op)
             .appendTo('#marc-overlay-rules-form');
-        }
 
-        var valid = true;
-        if (op == 'add' || op == 'edit') {
-            var validate = [
-                $('#marc-overlay-rules-form input[name="filter"]'),
-                $('#marc-overlay-rules-form input[name="tag"]')
-            ];
-            for(var i = 0; i < validate.length; i++) {
-                if (validate[i].length) {
-                    if(validate[i].val().length == 0) {
-                        validate[i].addClass('required');
-                        valid = false;
-                    } else {
-                        validate[i].removeClass('required');
+            if(id) {
+                $('<input type="hidden"/>')
+                .attr('name', 'id')
+                .attr('value', id)
+                .appendTo('#marc-overlay-rules-form');
+            }
+
+            var valid = true;
+            if (op == 'add' || op == 'edit') {
+                var validate = [
+                    $('#marc-overlay-rules-form input[name="filter"]'),
+                    $('#marc-overlay-rules-form input[name="tag"]')
+                ];
+                for(var i = 0; i < validate.length; i++) {
+                    if (validate[i].length) {
+                        if(validate[i].val().length == 0) {
+                            validate[i].addClass('required');
+                            valid = false;
+                        } else {
+                            validate[i].removeClass('required');
+                        }
                     }
                 }
             }
-        }
 
-        if (valid) {
-            $('#marc-overlay-rules-form').submit();
-        }
+            if (valid) {
+                $('#marc-overlay-rules-form').submit();
+            }
 
-        return valid;
-    }
+            return valid;
+        }
 
-    $(document).ready(function(){
         $('#doremove').on('click', function(){
             doSubmit('doremove');
         });
-- 
2.39.5