From 0c707e581afeeeb59279e881ccc23ca88beebd86 Mon Sep 17 00:00:00 2001
From: Lyon3 Team <koha@univ-lyon3.fr>
Date: Thu, 20 Sep 2012 14:57:30 +0200
Subject: [PATCH] Follow-up, hide multi button for subs with item
add also multi button to edit page
---
.../prog/en/modules/serials/serials-collection.tt | 2 +-
.../prog/en/modules/serials/serials-edit.tt | 7 +++++++
serials/serials-collection.pl | 5 +++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index 89d68b6..0fcf3ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -195,7 +195,7 @@ $(document).ready(function() {
<p>
<input type="submit" value="Edit serials" />
<input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
- [% IF ( subscriptions.size == 1 ) %] <input type="button" value="Multi receiving" onclick="javascript:generateReceive([% subscriptionidlist %])" />[% END %]
+ [% IF ( subscriptions.size == 1 and !serialsadditems ) %] <input type="button" value="Multi receiving" onclick="javascript:generateReceive([% subscriptionidlist %])" />[% END %]
</p>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 7c82b48..e6c058f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -3,6 +3,12 @@
[% INCLUDE 'doc-head-close.inc' %]
<script language="JavaScript" type="text/javascript">
//<![CDATA[
+function generateReceive() {
+ var subscriptionid = document.getElementsByName("subscriptionid")[0].value;
+ if(nbissues=prompt(_("How many issues do you want to receive ?"))){
+ document.location = 'serials-collection.pl?op=gennext&subscriptionid='+subscriptionid+'&nbissues='+nbissues;
+ }
+}
function popup(subscriptionid) {
window.open("subscription-renew.pl?subscriptionid="+subscriptionid,"subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
}
@@ -422,6 +428,7 @@ $(document).ready(function() {
</table>
<fieldset class="action"><input type="submit" value="Save" class="button" accesskey="w" />
+ [% UNLESS ( serialsadditems ) %] <input type="button" onclick="javascript:generateReceive()" value="Multi receiving">[% END %]
</form>
</div>
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 31ece2c..d8a57d7 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -165,8 +165,9 @@ $template->param(
routing => C4::Context->preference("RoutingSerials"),
subscr=>$query->param('subscriptionid'),
subscriptioncount => $subscriptioncount,
- location => $locationlib,
- callnumber => $callnumber,
+ location => $locationlib,
+ callnumber => $callnumber,
+ serialsadditems => $subscriptiondescs->[0]{'serialsadditems'},
);
output_html_with_http_headers $query, $cookie, $template->output;
--
1.7.2.5