Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster

This commit is contained in:
Chris Cormack 2011-07-11 21:09:25 +12:00
commit 1d0bdecd4b

View file

@ -31,6 +31,8 @@ my $query = new CGI;
my $branch = $query->param('branchcode');
my $template_name;
$branch = q{} unless defined $branch;
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "members/member.tmpl",
query => $query,
@ -42,13 +44,12 @@ my ($template, $loggedinuser, $cookie)
my $branches = GetBranches;
my @branchloop;
foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
my $selected = 1 if $branches->{$_}->{branchcode} eq $branch;
my %row = ( value => $_,
selected => $selected,
foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
push @branchloop, {
value => $_,
selected => ($branches->{$_}->{branchcode} eq $branch),
branchname => $branches->{$_}->{branchname},
);
push @branchloop, \%row;
};
}
my @categories;