Attachment 36062 Details for Bug 8436 – Bug 8436: Replace GetBranches with GetBranchesLoop

[patch] Bug 8436: Replace GetBranches with GetBranchesLoop

Bug-8436-Replace-GetBranches-with-GetBranchesLoop.patch (text/plain), 1.68 KB, created by Jonathan Druart on 2015-02-20 09:59:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-02-20 09:59:05 UTC

Size: 1.68 KB

patch

obsolete

>From 074402971b03aadc55a9e342ebd9be7ed20c7e89 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] 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>
>---
> serials/checkexpiration.pl | 20 +++-----------------
> 1 file changed, 3 insertions(+), 17 deletions(-)
>
>diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
>index 9e308ba..8505a4c 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;
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 8436: 11742 | 11746 | 19262 | 35166 | 36062 | 41891 | 43646 | 43647 | 43648 | 43649 | 43650 | 43750 | 43751