Attachment 6717 Details for Bug 7338 – Signed-off follow-up patch

[patch] Signed-off follow-up patch

0002-Bug-7338-Follow-up-show-link-only-when-there-is-more.patch (text/plain), 3.21 KB, created by Frédéric Demians on 2011-12-12 09:02:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Demians

Created: 2011-12-12 09:02:20 UTC

Size: 3.21 KB

patch

obsolete

>From da4f11c0f8c02a4a72ad771379690001eb697d58 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Mon, 12 Dec 2011 08:39:39 +0100
>Subject: [PATCH 2/2] Bug 7338: Follow up: show link only when there is more
> than 1 subscription
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>To be tested together with
>http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690
>
>1) Create a subscription for a title
>- check the link 'Show any subscription...' doesn't show now
>- check the serials collection page works correctly and shows all
>necessary information
>
>2) Create a second subscription for the same title
>- check a new link 'Show any subscription...' shows up now
>- use links in the issue table to change between viewing the single subscription
>and the overview page
>- check it works correctly and all information shows up
>
>Signed-off-by: FrÃ©dÃ©ric Demians <f.demians@tamil.fr>
>
>It works. With this patch, on Serials Collection page, the link, 'See any
>subscription attached to this biblio' appears only when there are more than one
>subscription attached to the biblio record.
>---
> .../prog/en/modules/serials/serials-collection.tt  |    2 ++
> serials/serials-collection.pl                      |    3 +++
> 2 files changed, 5 insertions(+), 0 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 ed126af..3777f47 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
>@@ -161,9 +161,11 @@ $(document).ready(function() {
>       </tr>
> [% END %]
> [% IF ( subscr ) %]
>+[% IF ( subscriptioncount > 1 ) %]
> <tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber %]">See any subscription attached to this biblio</a></td>
> </tr>
> [% END %]
>+[% END %]
> </table>
> [% END %]
> 
>diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
>index c4605e0..a67db7a 100755
>--- a/serials/serials-collection.pl
>+++ b/serials/serials-collection.pl
>@@ -93,6 +93,7 @@ if($op eq 'gennext' && @subscriptionid){
>     print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
> }
> 
>+my $subscriptioncount;
> my ($location, $callnumber);
> if (@subscriptionid){
>    my @subscriptioninformation=();
>@@ -123,6 +124,7 @@ if (@subscriptionid){
>     @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
>   }
>   $subscriptions=PrepareSerialsData(\@subscriptioninformation);
>+  $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
> } else {
>   $subscriptiondescs = GetSubscriptionsFromBiblionumber($biblionumber) ;
>   my $subscriptioninformation = GetFullSubscriptionsFromBiblionumber($biblionumber);
>@@ -157,6 +159,7 @@ $template->param(
>           suggestion => C4::Context->preference("suggestion"),
>           virtualshelves => C4::Context->preference("virtualshelves"),
>           subscr=>$query->param('subscriptionid'),
>+          subscriptioncount => $subscriptioncount,
>     location	       => $locationlib,
>     callnumber	       => $callnumber,
>           );
>-- 
>1.7.8
>

Actions: View | Diff | Splinter Review

Attachments on bug 7338: 6672 | 6688 | 6689 | 6690 | 6695 | 6713 | 6717 | 6733