Bug 16807: Frameworks unordered in dropdown when adding/editing a biblio

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 <hector.hecaxmmx@gmail.com>
Works as described

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index f0263ef..ef7b845 100755 (executable)
--- 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 a7f5300..0dcd73e 100644 (file)
--- 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 %]
                             <i class="fa fa-fw">&nbsp;</i>
                         [% END %]
-                        [% frameworkcodeloo.frameworktext %]
+                        [% frameworkcodeloo.description %]
                     </a>
                 </li>
             [% END %]