From 04acd0fef09df60cb6f9d902bb8d83c0b4168c87 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 23 Aug 2012 10:08:27 -0400 Subject: [PATCH] [SIGNED-OFF] Bug 2553 [Serials report] alphabetize dropdown menus Rebase of a patch originally submitted by gcollum@gmail.com Original commit message: Improvement on the previous patch through the use of GetBranchesLoop. Added code so that the logged in location will be the location that is selected by default. Fixed a couple of minor xhtml errors. Signed-off-by: Nicole C. Engard --- .../prog/en/modules/reports/serials_stats.tt | 12 ++++++++---- reports/serials_stats.pl | 16 ++-------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt index c42bc45..af51a4c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -73,20 +73,24 @@ [% END %]
  • -
  • - +
  • diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl index ff80b2f..9aff54b 100755 --- a/reports/serials_stats.pl +++ b/reports/serials_stats.pl @@ -140,19 +140,7 @@ if($do_it){ while(my $row = $sth->fetchrow_hashref){ push(@booksellers,$row) } - - ## We generate branchlist - 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 $CGIextChoice=CGI::scrolling_list( -name => 'MIME', -id => 'MIME', @@ -164,7 +152,7 @@ if($do_it){ CGIextChoice => $CGIextChoice, CGIsepChoice => $CGIsepChoice, booksellers => \@booksellers, - branches => \@branchloop); + branches => GetBranchesLoop(C4::Context->userenv->{'branch'})); } output_html_with_http_headers $input, $cookie, $template->output; -- 1.7.2.3