From 5ad6d9a72c8b88df210b2e10fb4c696705f704f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Fri, 9 Dec 2011 08:32:01 +0100 Subject: [PATCH] Bug 7338 Links on Serial Collection page Don't display link to the serial, when the collection page displays just one subscription. Display it when several subscriptions. Alway display a link for displaying biblio record other subscriptions. Signed-off-by: Katrin Fischer Patch works nicely, but always shows link to 'any subscriptions'. I did a follow-up so the link would only show if there was more than 1 subscription for the record. Signed-off-by: Paul Poulain (cherry picked from commit 33587674fa85fabfb6183b37bb8c2733ec2b6d6a) Signed-off-by: Chris Nighswonger --- .../prog/en/modules/serials/serials-collection.tt | 11 +++++------ serials/serials-collection.pl | 1 - 2 files changed, 5 insertions(+), 7 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 93c4fdc9c0..ed126af30e 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 @@ -71,7 +71,7 @@ $(document).ready(function() { [% IF ( subscriptions ) %] -[% IF ( onesubscription ) %] +[% IF ( subscriptions.size == 1 ) %] [% ELSE %] @@ -161,9 +161,8 @@ $(document).ready(function() { [% END %] [% IF ( subscr ) %] -[% UNLESS ( onesubscription ) %] - -[% END %] + + [% END %]
Subscription Summary Subscription Summaries
See any subscription attached to this biblio
See any subscription attached to this biblio
[% END %] @@ -183,7 +182,7 @@ $(document).ready(function() {
-[% UNLESS ( year.onesubscription ) %] +[% IF ( subscriptions.size > 1 ) %] [% END %] [% FOREACH serial IN year.serials %] [% UNLESS ( loop.odd ) %][% ELSE %][% END %] -[% UNLESS ( serial.onesubscription ) %] +[% IF ( subscriptions.size > 1 ) %] [% END %]
# SubsDate published @@ -205,7 +204,7 @@ $(document).ready(function() {
[% serial.subscriptionid %] diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 8c7c32bfa2..c4605e0249 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -147,7 +147,6 @@ foreach (@$location) { chop $subscriptionidlist; $template->param( - onesubscription => (scalar(@$subscriptiondescs)==1), subscriptionidlist => $subscriptionidlist, biblionumber => $biblionumber, subscriptions => $subscriptiondescs, -- 2.39.5