gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 2553: Alphabetization of branches in the catalogue stats report. 

Improvement on previous patch by using GetBranchesLoop.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Garry Collum 2009-07-21 20:36:15 -04:00 committed by Galen Charlton
parent 8c1b8b47c5
commit be1ef2b2fa
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
View File

@ -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>

14
reports/catalogue_stats.pl
View File

@ -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,