From 876ebcfe5db14c587cb425a1a8ed87a06e64a90e Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Fri, 20 Feb 2015 10:57:52 +0100
Subject: [PATCH] [PASSED QA] Bug 8436: Replace GetBranches with
GetBranchesLoop
The branch selection logic still exists in GetBranchesLoop, it should be
used here.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
---
serials/checkexpiration.pl | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 23e692f..df18fe2 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -106,31 +106,17 @@ if ($date) {
}
my $branchname;
-my @branches_loop;
+my $branches_loop;
if ( $flags->{superlibrarian}
or ( ref $flags->{serials} and $flags->{serials}->{superserials} )
or ( !ref $flags->{serials} and $flags->{serials} == 1 ) )
{
- my $branches = GetBranches();
- foreach my $b (sort keys %$branches) {
- my $selected = 0;
- if( $branch and $branch eq $b ){
- $selected = 1;
- $branchname = $branches->{$b}->{branchname};
- }
- push @branches_loop, {
- branchcode => $b,
- branchname => $branches->{$b}->{branchname},
- selected => $selected,
- };
- }
+ $branches_loop = C4::Branch::GetBranchesLoop( $branch );
}
$template->param (
(uc(C4::Context->preference("marcflavour"))) => 1,
- branches_loop => \@branches_loop,
- branchcode => $branch,
- branchname => $branchname,
+ branches_loop => $branches_loop,
);
output_html_with_http_headers $query, $cookie, $template->output;
--
1.9.1