From 3f24f83d6a1003379fd2351fc0acf99b11d23b7f Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 2 Feb 2022 23:36:58 +0000 Subject: [PATCH] Bug 27212: Add Table configuration to acqui-home.pl accounts table To test, apply the patch and clear your browser cache 1. Go to acqui-home.pl 2. Test that the "Columns" button works to show and hide columns. 3. Go to Administration -> Table settings and look under the Acquisitions tab for the page 'acq_acqui-home' and the table 'accounts'. 4. Hide each column and make sure it hides correctly on acqui-home.pl 5. Test the export options (Excel, CSV, etc) and make sure hidden columns do not show up. 6. Make sure the totals at the bottom of the screen can still be calculated Signed-off-by: Barbara Johnson Signed-off-by: Katrin Fischer --- admin/columns_settings.yml | 28 +++++++++++++++++++ .../prog/en/modules/acqui/acqui-home.tt | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 394b5d346e..1a91d8c6f5 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1,5 +1,33 @@ modules: acqui: + acq_acqui-home: + accounts: + columns: + - + columnname: active + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: budget_period_descriptions + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: fund_code + - + columnname: fund_name + - + columnname: owner + - + columnname: library + - + columnname: amount + - + columnname: ordered + - + columnname: spent + - + columnname: total_available + histsearch: histsearcht: columns: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index f2853fcfe4..e7041bf479 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE Price %] [% USE Branches %] +[% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Acquisitions › Koha @@ -216,7 +217,7 @@ dt_overwrite_html_sorting_localeCompare(); $(document).ready(function() { - + var column_settings = [% TablesSettings.GetColumns( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %]; var oTable = KohaTable("accounts", { "fnDrawCallback": function ( oSettings ) { if ( oSettings.aiDisplay.length == 0 ) @@ -256,7 +257,7 @@ 'aaSortingFixed': [[ 1, 'asc' ]], 'bPaginate': false, "bAutoWidth": false - }); + }, column_settings ); $(oTable).treetable({ expandable: true -- 2.30.2