From ba8a2c7e8ad871958c3c1b27536a3f3d922f2cbe Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Wed, 11 Aug 2010 09:58:04 +0200 Subject: [PATCH] (MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl. Signed-off-by: Colin Campbell --- .../prog/en/modules/serials/serials-collection.tmpl | 3 ++- .../prog/en/modules/serials/serials-edit.tmpl | 3 ++- serials/serials-collection.pl | 10 ++++++++++ serials/serials-edit.pl | 7 +++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl index 2763726988..220720e201 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl @@ -64,7 +64,8 @@ $(document).ready(function() { -

Serial Collection information for

+

Serial Collection information for ( ) + callnumber:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl index d8a2d1a21c..605d5f0667 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl @@ -177,7 +177,8 @@ $(document).ready(function() {
-

Serial Edition ()

+

Serial Edition + ( ) callnumber:

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 5cf57ed6f3..edad68665d 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -91,6 +91,7 @@ if($op eq 'gennext' && @subscriptionid){ print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid); } +my ($location, $callnumber); if (@subscriptionid){ my @subscriptioninformation=(); foreach my $subscriptionid (@subscriptionid){ @@ -113,6 +114,8 @@ if (@subscriptionid){ $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'}); $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'}); $subs->{'subscriptionid'} = $subscriptionid; # FIXME - why was this lost ? + $location = GetAuthorisedValues('LOC', $subs->{'location'}); + $callnumber = $subs->{callnumber}; push @$subscriptiondescs,$subs; my $tmpsubscription= GetFullSubscription($subscriptionid); @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation); @@ -135,6 +138,11 @@ foreach my $subscription (@$subscriptiondescs){ # warn "title : $title yearmax : $yearmax nombre d'elements dans le tableau :".scalar(@$subscriptions); # use Data::Dumper; warn Dumper($subscriptions); +my $locationlib; +foreach (@$location) { + $locationlib = $_->{'lib'} if $_->{'selected'}; +} + chop $subscriptionidlist; $template->param( onesubscription => (scalar(@$subscriptiondescs)==1), @@ -148,6 +156,8 @@ $template->param( suggestion => C4::Context->preference("suggestion"), virtualshelves => C4::Context->preference("virtualshelves"), subscr=>$query->param('subscriptionid'), + location => $locationlib, + callnumber => $callnumber, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index b79da4b3a7..a9484748ca 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -369,14 +369,21 @@ if ( $op and $op eq 'serialchangestatus' ) { print $query->redirect($redirect); } } +my $location = GetAuthorisedValues('LOC', $serialdatalist[0]->{'location'}); +my $locationlib; +foreach (@$location) { + $locationlib = $_->{'lib'} if $_->{'selected'}; +} my $default_bib_view = get_default_view(); $template->param( serialsadditems => $serialdatalist[0]->{'serialsadditems'}, + callnumber => $serialdatalist[0]->{'callnumber'}, bibliotitle => $bibdata->{'title'}, biblionumber => $serialdatalist[0]->{'biblionumber'}, serialslist => \@serialdatalist, default_bib_view => $default_bib_view, + location => $locationlib, ); output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.5