From e47e825c430eec0077f6d8036f2cc0d7abc7b0d3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 17 Jul 2013 15:02:43 +0200 Subject: [PATCH] Bug 10038: Doubled 'default' entry when creating a new authority type Test plan: - Create a new authority type - Click MARC structure - Verify the pull down has only 1 entry for Default - Go on the authority type home (admin/authtypes.pl) - Click on the "MARC structure" link for the default type - Verify the pull down has only 1 entry for Default This patch adds a sort (on the authtypecode) for these 2 lists. --- admin/auth_tag_structure.pl | 3 ++- .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl index 906f8d3..e84b459 100755 --- a/admin/auth_tag_structure.pl +++ b/admin/auth_tag_structure.pl @@ -57,7 +57,7 @@ my ($template, $loggedinuser, $cookie) # get authtype list my $authtypes = getauthtypes; my @authtypesloop = (); -foreach my $thisauthtype ( keys %{$authtypes} ) { +foreach my $thisauthtype ( sort keys %{$authtypes} ) { push @authtypesloop, { value => $thisauthtype, selected => $thisauthtype eq $authtypecode, @@ -209,6 +209,7 @@ if ($op eq 'add_form') { push @existingauthtypeloop,\%line; } } + @existingauthtypeloop = sort { lc($a->{authtypetext}) cmp lc($b->{authtypetext}) }@existingauthtypeloop; $template->param(existingauthtypeloop => \@existingauthtypeloop, authtypecode => $authtypecode, ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index fc61789..70744ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -192,9 +192,12 @@ return false; Create authority framework for [% authtypecode %] using @@ -211,7 +214,6 @@ return false;

Select an authority framework