From cccb73cd2c430e51dac9ba2357360c3f95bf738b Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Thu, 5 Apr 2018 14:16:47 +0000 Subject: [PATCH] Bug 17047 - Move mana JS and put correct subscription id when sharing Signed-off-by: Brendan A Gallagher --- koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc | 2 +- .../prog/en/includes/serials-toolbar.inc | 40 ---------------------- .../prog/en/modules/serials/subscription-detail.tt | 1 + koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js | 2 +- .../intranet-tmpl/prog/js/subscription-add.js | 2 +- serials/subscription-detail.pl | 4 +-- 6 files changed, 6 insertions(+), 45 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc index d57290c..04e4181 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc @@ -41,4 +41,4 @@ $(document).ready(function() { }); }); //]]> - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index ffa83ee..f238c51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,44 +1,4 @@ [% INCLUDE 'blocking_errors.inc' %] -[% INCLUDE 'mana.inc' %] - [% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription || CAN_user_serials_receive_serials ) %]
[% IF CAN_user_serials_create_subscription %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 1ce4520..291a6eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -385,6 +385,7 @@ var MSG_REOPEN_SUBSCRIPTION = _("Are you sure you want to reopen this subscription?"); var CONFIRM_DELETE_SUBSCRIPTION = _("Are you sure you want to delete this subscription?"); + [% INCLUDE 'mana.inc' %]