From d83120314d0a0c62cbc77cf2fc96c048830ea1d4 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 Signed-off-by: David Nind --- admin/biblio_framework.pl | 8 +++++++- .../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 16d49fb9f1..3d05196b87 100755 --- a/admin/biblio_framework.pl +++ b/admin/biblio_framework.pl @@ -121,12 +121,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 66bfa260f7..a17d5785e8 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 @@ -133,6 +133,7 @@ MARC frameworks › Administration › Koha [% ELSE %] [% END %] + Unset to revert default framework to Default @@ -173,6 +174,7 @@ MARC frameworks › Administration › Koha Code Description + Is default?   @@ -180,6 +182,7 @@ MARC frameworks › Administration › Koha   Default framework + [% IF default_framework == '' %]Yes[% ELSE %]No[% END %]