Bug 8438: Users can only claim for serials related to their branch.

[koha_ffzg] / serials / serials-collection.pl

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 28b4d6a..900064a 100755 (executable)
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -5,23 +5,23 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
 use strict;
 use warnings;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Koha;
 use C4::Dates qw/format_date/;
@@ -37,9 +37,8 @@ my $op = $query->param('op') || q{};
 my $nbissues=$query->param('nbissues');
 my $dbh = C4::Context->dbh;
 
-my ($template, $loggedinuser, $cookie);
-($template, $loggedinuser, $cookie)
-  = get_template_and_user({template_name => "serials/serials-collection.tmpl",
+my ($template, $loggedinuser, $cookie)
+  = get_template_and_user({template_name => "serials/serials-collection.tt",
                             query => $query,
                             type => "intranet",
                             authnotrequired => 0,
@@ -107,6 +106,7 @@ if (@subscriptionid){
    foreach my $subscriptionid (@subscriptionid){
     my $subs= GetSubscription($subscriptionid);
     $closed = 1 if $subs->{closed};
+
     $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
     $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
     $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
@@ -128,6 +128,7 @@ if (@subscriptionid){
     my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
     $subs->{frequency} = $frequency;
     $subs->{numberpattern} = $numberpattern;
+    $subs->{'hasRouting'} = check_routing($subscriptionid);
     push @$subscriptiondescs,$subs;
     my $tmpsubscription= GetFullSubscription($subscriptionid);
     @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
@@ -176,7 +177,6 @@ $template->param(
           callnumber          => $callnumber,
           uc(C4::Context->preference("marcflavour")) => 1,
           serialsadditems   => $subscriptiondescs->[0]{'serialsadditems'},
-          dateformatmetric   => C4::Context->preference("dateformat") eq "metric" ? 1 : 0,
           );
 
 output_html_with_http_headers $query, $cookie, $template->output;