Bug 16807 - Use Koha::BiblioFrameworks instead of GetFrameWorkLoop

Refactor code to use work from 14889

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 ef7b845..1e7cb61 100755 (executable)
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -35,6 +35,7 @@ use C4::Branch;
 use C4::ClassSource;
 use C4::ImportBatch;
 use C4::Charset;
+use Koha::BiblioFrameworks;
 
 use Date::Calc qw(Today);
 use MARC::File::USMARC;
@@ -745,8 +746,8 @@ if ($frameworkcode eq 'FA'){
     print $input->redirect( '/cgi-bin/koha/cataloguing/editor.pl' . ( $biblionumber ? ( '#catalog/' . $biblionumber ) : '' ) );
 }
 
-
-$template->param( frameworkcodeloop => GetFrameworksLoop( $frameworkcode ) ,
+my $frameworkcodeloop = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
+$template->param( frameworkcodeloop => $frameworkcodeloop ,
        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 0dcd73e..df7b4a2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -494,13 +494,13 @@ function Changefwk(FwkList) {
             </li>
             [% FOREACH frameworkcodeloo IN frameworkcodeloop %]
                 <li>
-                    <a href="#" class="change-framework" data-frameworkcode="[% frameworkcodeloo.value %]">
-                        [% IF ( frameworkcodeloo.selected ) %]
+                    <a href="#" class="change-framework" data-frameworkcode="[% frameworkcodeloo.frameworkcode %]">
+                        [% IF ( frameworkcodeloo.frameworkcode == frameworkcode ) %]
                             <i class="fa fa-fw fa-check"></i>
                         [% ELSE %]
                             <i class="fa fa-fw">&nbsp;</i>
                         [% END %]
-                        [% frameworkcodeloo.description %]
+                        [% frameworkcodeloo.frameworktext %]
                     </a>
                 </li>
             [% END %]