@@ -, +, @@
---
.../prog/en/includes/hold-group-modal.inc | 41 ++++++++--------------
.../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, 40 insertions(+), 33 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/hold-group.js
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc
@@ -1,27 +1,16 @@
-
-
-
Loading
-
-
-
-
-
+
+
+
+
+
Loading
+
+
+
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -977,6 +977,8 @@ No patron matched [% message | html %]
+[% INCLUDE 'hold-group-modal.inc' %]
+
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'strings.inc' %]
[% INCLUDE 'calendar.inc' %]
@@ -990,6 +992,7 @@ No patron matched [% message | html %]
[% 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 %]
[% 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' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -818,6 +818,8 @@
[% # /div#bd %]
+[% INCLUDE 'hold-group-modal.inc' %]
+
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
@@ -833,6 +835,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") %]
[% END %]
-[% INCLUDE 'hold-group-modal.inc' %]
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -537,7 +537,7 @@
[% IF ( biblioloo.reserveloop ) %]
[% IF ( multi_hold ) %]
@@ -660,10 +660,13 @@
+[% 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 %]
[% END %]
-[% INCLUDE 'hold-group-modal.inc' %]
-
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js
+++ a/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(' ' + _("Loading") + '
');
+ });
+});
--