From be1ef2b2fa074e858c8bce5857e56be7b2281ec0 Mon Sep 17 00:00:00 2001 From: Garry Collum Date: Tue, 21 Jul 2009 20:36:15 -0400 Subject: [PATCH] Bug 2553: Alphabetization of branches in the catalogue stats report. Improvement on previous patch by using GetBranchesLoop. Signed-off-by: Galen Charlton --- .../prog/en/modules/reports/catalogue_stats.tmpl | 2 +- reports/catalogue_stats.pl | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl index c367cec71a..419193eee0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl @@ -157,7 +157,7 @@ diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl index 365065fc41..f3b92b3029 100755 --- a/reports/catalogue_stats.pl +++ b/reports/catalogue_stats.pl @@ -153,18 +153,6 @@ if ($do_it) { push @authvals, { code => $_, description => $authvals->{$_} }; } - - my $branches=GetBranches(); - my @branchloop; - foreach (sort {$branches->{$a}->{'branchname'} cmp $branches->{$b}->{'branchname'}} keys %$branches) { - my $thisbranch = ''; # FIXME: populate $thisbranch to preselect one - my %row = (branchcode => $_, - selected => ($thisbranch eq $_ ? 1 : 0), - branchname => $branches->{$_}->{'branchname'}, - ); - push @branchloop, \%row; - } - my $locations = GetKohaAuthorisedValues("items.location"); my @locations; foreach (sort keys %$locations) { @@ -177,7 +165,7 @@ if ($do_it) { haslccn => $haslccn, hascote => $hascote, CGIItemType => $CGIitemtype, - CGIBranch => \@branchloop, + CGIBranch => GetBranchesLoop(C4::Context->userenv->{'branch'}), locationloop => \@locations, authvals => \@authvals, CGIextChoice => \@mime, -- 2.39.5