From b7b2ccfa868745e94cdfc5d3f4212dd707ab119a Mon Sep 17 00:00:00 2001 From: Lyon3 Team Date: Thu, 17 Jan 2013 18:55:01 +0100 Subject: [PATCH] [PASSED QA] Bug 7654:Add location and callnumber at opac subscription view Signed-off-by: Paul Poulain --- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 8 ++++++-- opac/opac-detail.pl | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 6321efd..69a226e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -1146,10 +1146,14 @@ YAHOO.util.Event.onContentReady("furtherm", function () {

This is a serial

There are [% subscriptionsnumber %] subscription(s) associated with this title.

[% FOREACH subscription IN subscriptions %] - [% IF ( subscription.branchname ) %]

At library: [% subscription.branchname %]

[% ELSE %] - [% IF ( subscription.branchcode ) %]

At library: [% subscription.branchcode %]

[% END %][% END %] +


+ [% IF ( subscription.branchname ) %][% subscription.branchname %][% ELSE %] + [% IF ( subscription.branchcode ) %][% subscription.branchcode %][% END %][% END %] + [% IF ( subscription.location_description ) %], [% subscription.location_description %][% ELSIF subscription.location %], [% subscription.location %][% END %] + [% IF ( subscription.callnumber ) %], [% subscription.callnumber %][% END %] [% IF ( subscription.closed ) %]

This subscription is closed.

[% END %] [% IF ( subscription.callnumber ) %]

Callnumber: [% subscription.callnumber %]

[% END %]
+

[% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes FILTER html_line_break %]

[% END %]

Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]

[% IF ( subscription.missinglist ) %]

Missing issues: [% subscription.missinglist %]

[% END %] diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 4371f65..e5b3f99 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -471,8 +471,10 @@ foreach my $subscription (@subscriptions) { $cell{histenddate} = $subscription->{histenddate}; $cell{branchcode} = $subscription->{branchcode}; $cell{branchname} = GetBranchName($subscription->{branchcode}); - $cell{hasalert} = $subscription->{hasalert}; + $cell{location} = $subscription->{location}; + $cell{location_description} = $shelflocations->{ $subscription->{'location'} }; $cell{callnumber} = $subscription->{callnumber}; + $cell{hasalert} = $subscription->{hasalert}; $cell{closed} = $subscription->{closed}; #get the three latest serials. $serials_to_display = $subscription->{opacdisplaycount}; -- 1.7.9.5