[Koha-patches] [PATCH] Bug 2553: Alphabetization of branches in the catalogue stats report.
Garry Collum
gcollum at gmail.com
Wed Jul 22 02:36:15 CEST 2009
Improvement on previous patch by using GetBranchesLoop.
---
.../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 c367cec..419193e 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 @@
<td><select name="Filter" id="branch">
<option value=""> </option>
<!-- TMPL_LOOP NAME="CGIBranch" -->
- <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="branchcode" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></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/catalogue_stats.pl b/reports/catalogue_stats.pl
index 365065f..f3b92b3 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,
--
1.5.6.5
More information about the Koha-patches
mailing list