From 8d0c4ab5754d5f1f551723a6fa9bc1bd616bea5a Mon Sep 17 00:00:00 2001 From: Josef Moravec 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 Signed-off-by: Michal Denar --- .../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 | 5 ++- koha-tmpl/intranet-tmpl/prog/js/hold-group.js | 12 ++++++ 6 files changed, 39 insertions(+), 32 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 77ec0e603c..72d92fe0fa 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,16 @@ - - + + 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 2fe75ea738..8e9e027a37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -976,6 +976,8 @@ +[% INCLUDE 'hold-group-modal.inc' %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'strings.inc' %] [% INCLUDE 'calendar.inc' %] @@ -989,6 +991,7 @@ [% 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' %] 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 5b59d0039f..4f3eb42c20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -830,6 +830,8 @@ +[% INCLUDE 'hold-group-modal.inc' %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] @@ -845,6 +847,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' %] 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 e77a73aa83..0fb3de539c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -735,11 +735,14 @@ +[% INCLUDE 'hold-group-modal.inc' %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'columns_settings.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' %] 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 0000000000..ca961281dd --- /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('
' + _("Loading") + '
'); + }); +}); -- 2.20.1