From 9c4576cb93e07f2c5243656c87ef19863d91cc3d Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 24 Jun 2016 09:57:07 -0400 Subject: [PATCH] Bug 16807: Frameworks unordered in dropdown when adding/editing a biblio MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To test: Start to add or edit a biblio Open the dropdown to change framework Notice the order Refresh the page - notice the order changes Apply patch Order is alphabetical Refresh the page Order does not change Signed-off-by: Hector Castro Works as described Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall (cherry picked from commit d17085ea0361f8581a796e5f17d0413b37b7b598) Signed-off-by: Frédéric Demians --- cataloguing/addbiblio.pl | 16 +--------------- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index f0263ef05f..ef7b845f73 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -746,21 +746,7 @@ if ($frameworkcode eq 'FA'){ } -# Getting the list of all frameworks -# get framework list -my $frameworks = getframeworks; -my @frameworkcodeloop; -foreach my $thisframeworkcode ( keys %$frameworks ) { - my %row = ( - value => $thisframeworkcode, - frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'}, - ); - if ($frameworkcode eq $thisframeworkcode){ - $row{'selected'} = 1; - } - push @frameworkcodeloop, \%row; -} -$template->param( frameworkcodeloop => \@frameworkcodeloop, +$template->param( frameworkcodeloop => GetFrameworksLoop( $frameworkcode ) , breedingid => $breedingid ); # ++ Global diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index a7f5300a1d..0dcd73ec45 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -500,7 +500,7 @@ function Changefwk(FwkList) { [% ELSE %]   [% END %] - [% frameworkcodeloo.frameworktext %] + [% frameworkcodeloo.description %] [% END %] -- 2.39.5