@@ -, +, @@
sharing
---
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(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/mana.inc
@@ -41,4 +41,4 @@ $(document).ready(function() {
});
});
//]]>
-
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc
+++ a/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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -434,6 +434,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' %]
[% Asset.js("js/serials-toolbar.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/serials-toolbar.js
@@ -41,6 +41,6 @@ function popup(subscriptionid) {
return false;
});
$("#mana-subscription-share").click(function() {
- window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=share";
+ window.location="subscription-detail.pl?subscriptionid=" + subscriptionid + "&op=share";
});
});
--- a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js
@@ -650,4 +650,4 @@ $(document).ready(function() {
$('#save-subscription').on("click", function(e){
$('select:disabled').removeAttr('disabled');
});
-});
+});
--- a/serials/subscription-detail.pl
+++ a/serials/subscription-detail.pl
@@ -62,7 +62,6 @@ my ($template, $loggedinuser, $cookie)
debug => 1,
});
-
my $subs = GetSubscription($subscriptionid);
output_and_exit( $query, $cookie, $template, 'unknown_subscription')
@@ -100,7 +99,8 @@ if ($op eq 'del') {
}
}
elsif ( $op and $op eq "share" ) {
- my $result = Koha::SharedContent::manaPostRequest($query->param('mana_language'), $loggedinuser, $subscriptionid, 'subscription');
+ my $mana_language = $query->param('mana_language');
+ my $result = Koha::SharedContent::manaPostRequest($mana_language, $loggedinuser, $subscriptionid, 'subscription');
$template->param( mana_code => $result->{msg} );
$subs->{mana_id} = $result->{id};
}
--