From fb2669673dab127e7ad1d191bc1f9d53bbb5ae7b Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 5 Dec 2014 15:50:05 +0100 Subject: [PATCH] Bug 13401 - sort branches alphabetically in admin/authorised_values.pl This patch adds a sort of branches alphabetically by name in authorised values administration, like in many other pages. Also replaces var $branch (too ambigus) by $branchcode. Test plan : - Create 2 branches : code=AAA,name=Zbranch and code=ZZZ,name=Abranch - Create a new authorized value : admin/authorised_values.pl - Look at "Libraries limitation" : => Without patch branches are sorted by code : Zbranch then Abranch => Without patch branches are sorted by name : Abranch then Zbranch - Select a branch and save - Re-edit => Check the same branch is selected Followed test plan. Patch behaves as expected. Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b6aae39c263eee482aaeb574c206fa0c2c69f120) Signed-off-by: Chris Cormack --- admin/authorised_values.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 35afacac66..1e373c4b5f 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -85,11 +85,11 @@ if ($op eq 'add_form') { my $branches = GetBranches; my @branches_loop; - foreach my $branch (sort keys %$branches) { - my $selected = ( grep {$_->{branchcode} eq $branch} @selected_branches ) ? 1 : 0; + foreach my $branchcode ( sort { uc($branches->{$a}->{branchname}) cmp uc($branches->{$b}->{branchname}) } keys %$branches ) { + my $selected = ( grep {$_->{branchcode} eq $branchcode} @selected_branches ) ? 1 : 0; push @branches_loop, { - branchcode => $branches->{$branch}{branchcode}, - branchname => $branches->{$branch}{branchname}, + branchcode => $branchcode, + branchname => $branches->{$branchcode}->{branchname}, selected => $selected, }; } -- 2.39.5