(MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>

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 2763726..220720e 100644 (file)
--- 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() {
 <!-- TMPL_UNLESS name="popup" -->
        <!-- TMPL_INCLUDE NAME="serials-toolbar.inc" -->
 
-       <h1>Serial Collection information for  <i><!-- TMPL_VAR name="bibliotitle" --></i></h1>
+       <h1>Serial Collection information for  <i><!-- TMPL_VAR name="bibliotitle" --></i> (<!-- TMPL_VAR name="location" --> ) 
+               <!--TMPL_IF Name="callnumber"-->callnumber: <!-- TMPL_VAR name="callnumber" --><!--/TMPL_IF--></h1>
 <!-- /TMPL_UNLESS -->
 
 <!--TMPL_IF Name="subscriptions"-->

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 d8a2d1a..605d5f0 100644 (file)
--- 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() {
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>Serial Edition <i><!-- TMPL_VAR name="bibliotitle" --> <!-- TMPL_IF name="callnumber" -->(<!-- TMPL_VAR name="callnumber" -->)<!-- /TMPL_IF --></i></h1>
+<h1>Serial Edition <i><!-- TMPL_VAR name="bibliotitle" --></i>
+       ( <!-- TMPL_VAR name="location" --> ) <!-- TMPL_IF name="callnumber" --> callnumber: <!-- TMPL_VAR name="callnumber" --><!-- /TMPL_IF --></h1>
 <form method="post" name="f" action="serials-edit.pl" id="serials_edit">
 <!--onsubmit="return barcode_check()">-->
 

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 5cf57ed..edad686 100755 (executable)
--- 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 b79da4b..a948474 100755 (executable)
--- 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;