From ebc7f656d69ae0b3247b55c0dcd2fd301331922e Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Sat, 24 Oct 2020 14:56:13 +1300 Subject: [PATCH] Bug 23111: (follow-up) Add a column to show default framework --- admin/biblio_framework.pl | 8 +++++++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl index b07ce8d84db..57b37c3db03 100755 --- a/admin/biblio_framework.pl +++ b/admin/biblio_framework.pl @@ -120,12 +120,18 @@ if ( $op eq 'add_form' ) { if ( $op eq 'list' ) { my $frameworks = Koha::BiblioFrameworks->search( {}, { order_by => ['frameworktext'], } ); - $template->param( frameworks => $frameworks, ); + my $default_framework = Koha::BiblioFrameworks->get_default; + $template->param( + frameworks => $frameworks, + default_framework => ( $default_framework && $default_framework->frameworkcode ne '' ) ? $default_framework->frameworkcode : '', + ); } +my $default_framework = Koha::BiblioFrameworks->get_default; $template->param( messages => \@messages, op => $op, + default_framework => ( $default_framework && $default_framework->frameworkcode ne '' ) ? $default_framework->frameworkcode : '', ); output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index f3d7ad199e9..d49da368a48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -94,6 +94,7 @@ [% ELSE %] [% END %] + Unset to revert default framework to Default @@ -134,6 +135,7 @@ Code Description + Is default?   @@ -141,6 +143,7 @@   Default framework + [% IF default_framework == '' %]Yes[% ELSE %]No[% END %]
@@ -209,6 +212,7 @@ [% loo.frameworkcode | html %] [% loo.frameworktext | html %] + [% IF loo.is_default %]Yes[% ELSE %]No[% END %]