From 7b9ea37554f5b439ed9347e5961cc1456b960888 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Fri, 21 Sep 2018 11:17:41 +0000
Subject: [PATCH] Bug 15516: (follow-up) Fix modal for hold group

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
---
 .../prog/en/includes/hold-group-modal.inc          | 36 ++++++++--------------
 .../prog/en/modules/circ/circulation.tt            |  4 ++-
 .../prog/en/modules/circ/pendingreserves.tt        |  5 +--
 .../prog/en/modules/members/moremember.tt          |  4 ++-
 .../prog/en/modules/reserve/request.tt             |  7 +++--
 koha-tmpl/intranet-tmpl/prog/js/hold-group.js      | 12 ++++++++
 6 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/js/hold-group.js

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
index 77ec0e6..628760a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
@@ -1,27 +1,17 @@
-<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
-    <div class="modal-header">
+<div id="hold-group-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
         <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
         <h3 id="hold-group-modal-label">Reserve group</h3>
-    </div>
-    <div class="modal-body">
+      </div>
+      <div class="modal-body">
         <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
-    </div>
-    <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-    </div>
-</div>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
-<script>
-  $(document).ready(function() {
-    $('body').on('click', 'a.hold-group', function() {
-      var href = $(this).attr('href');
-      $('#hold-group-modal .modal-body').load(href + " #main");
-      $('#hold-group-modal').modal('show');
-      return false;
-    })
-
-    $('#hold-group-modal').on('hidden', function(){
-        $('#hold-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _("Loading") + '</div>');
-    });
-  });
-</script>
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 65dcdbd..5e0717c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -973,6 +973,8 @@ No patron matched <span class="ex">[% message | html %]</span>
     </div>
 </div>
 
+[% INCLUDE 'hold-group-modal.inc' %]
+
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'strings.inc' %]
     [% INCLUDE 'calendar.inc' %]
@@ -986,6 +988,7 @@ No patron matched <span class="ex">[% message | html %]</span>
     [% Asset.js("js/checkouts.js") | $raw %]
     [% Asset.js("js/holds.js") | $raw %]
     [% Asset.js("js/circ-patron-search-results.js") | $raw %]
+    [% Asset.js("js/hold-group.js") | $raw %]
     <script type="text/javascript">
         /* Set some variable needed in circulation.js */
         var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
@@ -1101,5 +1104,4 @@ No patron matched <span class="ex">[% message | html %]</span>
     [% Asset.js("js/members-menu.js") | $raw %]
 [% END %]
 
-[% INCLUDE 'reserve-group-modal.inc' %]
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index b18b7a9..76186da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -201,10 +201,13 @@
 </div>
 </div>
 
+[% INCLUDE 'hold-group-modal.inc' %]
+
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
+    [% Asset.js("js/hold-group.js") | $raw %]
     <script type="text/javascript">
         $(document).ready(function() {
           var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
@@ -265,6 +268,4 @@
     </script>
 [% END %]
 
-[%# TODO: this module needs to be separated to html and js part to be included correctly %]
-[% INCLUDE 'hold-group-modal.inc' %]
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index afe9a91..c178c44 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -791,6 +791,8 @@
             </div>
         </div> [% # /div#bd %]
 
+[% INCLUDE 'hold-group-modal.inc' %]
+
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
@@ -806,6 +808,7 @@
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
     [% Asset.js("js/messaging-preference-form.js") | $raw %]
+    [% Asset.js("js/hold-group.js") | $raw %]
     <script>
         /* Set some variable needed in circulation.js */
         var interface = "[% interface | html %]";
@@ -929,5 +932,4 @@
     </script>
 [% END %]
 
-[% INCLUDE 'hold-group-modal.inc' %]
 [% INCLUDE 'intranet-bottom.inc' %]
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 8488e41..00266eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -536,7 +536,7 @@
                     [% IF ( biblioloo.reserveloop ) %]
                         [% IF ( multi_hold ) %]
                             <h3>
-                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">
+                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">
                                     [% biblioloo.title | html %]
                                 </a>
                             </h3>
@@ -659,10 +659,13 @@
 </div>
 </div>
 
+[% INCLUDE 'hold-group-modal.inc' %]
+
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'calendar.inc' %]
     [% Asset.js("js/circ-patron-search-results.js") | $raw %]
+    [% Asset.js("js/hold-group.js") | $raw %]
     <script>
         var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
         var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
@@ -876,6 +879,4 @@
     </script>
 [% END %]
 
-[% INCLUDE 'hold-group-modal.inc' %]
-
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js b/koha-tmpl/intranet-tmpl/prog/js/hold-group.js
new file mode 100644
index 0000000..ca96128
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/js/hold-group.js
@@ -0,0 +1,12 @@
+$(document).ready(function() {
+    $('body').on('click', 'a.hold-group', function() {
+        var href = $(this).attr('href');
+        $('#hold-group-modal .modal-body').load(href + " #main");
+        $('#hold-group-modal').modal('show');
+        return false;
+    });
+
+    $('#hold-group-modal').on('hidden', function(){
+        $('#hold-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _("Loading") + '</div>');
+    });
+});
-- 
2.1.4