From 8c1b8b47c57ca7c1671c54abc293b30d15231fd0 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Tue, 21 Jul 2009 20:46:10 -0400
Subject: [PATCH] Bug 2553: Alphabetization of branches in Checkout Statistics
 form.

Improvement of previous patch through the use of GetBranchLoop.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 .../prog/en/modules/reports/issues_stats.tmpl     |  2 +-
 reports/issues_stats.pl                           | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 5eb0101680..6495a91fa2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -210,7 +210,7 @@
             <td><select name="Filter" id="branch">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="branchloop" -->
-<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
                </select>
              </td> 
diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
index 11ecc77ac3..cd004245b3 100755
--- a/reports/issues_stats.pl
+++ b/reports/issues_stats.pl
@@ -137,19 +137,6 @@ for my $itype ( sort {$itemtypes->{$a}->{description} cmp $itemtypes->{$b}->{des
 	push @itemtypeloop, { code => $itype , description => $itemtypes->{$itype}->{description} } ;
 }
 
-my $branches=GetBranches();
-my @branchloop;
-foreach (sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches) {
-	my $thisbranch = ''; # FIXME 
-	my %row = (
-		branchcode => $_,
-		selected => ($thisbranch eq $_ ? 1 : 0),
-		code => $branches->{$_}->{'branchcode'},
-		description => $branches->{$_}->{'branchname'},
-	);
-	push @branchloop, \%row;
-}
-
     # location list
 my @locations;
 foreach (sort keys %$locations) {
@@ -178,7 +165,7 @@ $template->param(
 	itemtypeloop => \@itemtypeloop,
 	locationloop => \@locations,
 	   ccodeloop => \@ccodes,
-	  branchloop => \@branchloop,
+	  branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
 	hassort1=> $hassort1,
 	hassort2=> $hassort2,
 	Bsort1 => $Bsort1,
-- 
2.39.5