From 3672df52265d4c3caf6aef84b9f3e3b9f01f47d6 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 15 Feb 2018 19:43:39 +0000
Subject: [PATCH] Bug 20221: Fix for JavaScript error during checkout patron
 search

This patch fixes a bug caused by the changes in Bug 19641. JavaScript
embedded in circ-patron-search-results.inc executes before jQuery is
loaded.

This patch adds a separate javascript file which can be included both in
circulation.tt and request.tt since both use the same include.

To test, apply the patch and submit a patron name in the check out form.
On the page of search results, clicking a table row should work the same
as clicking the patron name link.

Perform the same test during the hold process: Locate and place a hold
on a title. In the patron search form, submit a patron name and test the
behavior of the search results screen.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/circ-patron-search-results.inc  | 12 ------------
 .../prog/en/modules/circ/circulation.tt              |  1 +
 .../intranet-tmpl/prog/en/modules/reserve/request.tt |  1 +
 .../prog/js/circ-patron-search-results.js            | 11 +++++++++++
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
index 29e72a2df9..8d8fcc65f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
@@ -1,16 +1,4 @@
 [% USE KohaDates %]
-<script type="text/javascript">
-    $(document).ready(function() {
-        $(".clickable").click(function() {
-            window.document.location = $(this).data('url');
-        });
-        var table = $("#table_borrowers").dataTable($.extend(true, {}, dataTablesDefaults, {
-            "aaSorting": [ 0, "asc" ],
-            "sDom": "t",
-            "iDisplayLength": -1
-        }));
-    });
-</script>
 <legend>Patron selection</legend>
 <table id="table_borrowers" class="table_borrowers">
     <thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 92489bf817..3068d57088 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -983,6 +983,7 @@ No patron matched <span class="ex">[% message | html %]</span>
     <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>
     <script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script>
     <script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script>
     <script type="text/javascript">
         /* Set some variable needed in circulation.js */
         var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 7b1c873974..1cd3618149 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -13,6 +13,7 @@
 <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
 [% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'calendar.inc' %]
+<script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script>
 <script type="text/javascript">
     // <![CDATA[
 var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
diff --git a/koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js b/koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js
new file mode 100644
index 0000000000..f778d159c3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js
@@ -0,0 +1,11 @@
+/* global dataTablesDefaults */
+$(document).ready(function() {
+    $(".clickable").click(function() {
+        window.document.location = $(this).data('url');
+    });
+    var table = $("#table_borrowers").dataTable($.extend(true, {}, dataTablesDefaults, {
+        "aaSorting": [ 0, "asc" ],
+        "sDom": "t",
+        "iDisplayLength": -1
+    }));
+});
\ No newline at end of file
-- 
2.39.5