From 138797a118ceeedeca644998612cf442216fc67f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 28 Jul 2018 12:42:31 -0300 Subject: [PATCH] Bug 21166: Add column settings to the acquisition table on bib detail Sponsored-by: BULAC - http://www.bulac.fr/ --- admin/columns_settings.yml | 24 ++++++++++++++++++++++ .../prog/en/modules/catalogue/detail.tt | 8 +++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 3e2a6723e5..a76acc0112 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -85,6 +85,30 @@ modules: catalogue: detail: + acquisitiondetails-table: + - + columnname: vendor + - + columnname: invoice + - + columnname: basketgroup + - + columnname: basket + - + columnname: ordernumber + - + columnname: creation_date + - + columnname: received_data + - + columnname: status + - + columnname: quantity + - + columnname: subscription + - + columnname: subscription_callnumber + checkoutshistory-table: - columnname: patron diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index ce02cb63fe..ce1c8634e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -5,6 +5,7 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE Biblio %] +[% USE ColumnsSettings %] [% IF Koha.Preference('AmazonAssocTag') %] [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %] @@ -1107,15 +1108,16 @@ } [% IF Koha.Preference('AcquisitionDetails') %] - $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, { - 'sDom': 't', + var columns_settings = [% ColumnsSettings.GetColumns('catalogue', 'detail', 'acquisitiondetails-table', 'json') %]; + var acquisitiondetails_table = KohaTable("orders", { + "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', 'bPaginate': false, 'bAutoWidth': false, "aaSorting": [[ 4, "desc" ]], "aoColumnDefs": [ { "aTargets": "title-string", "sType": "title-string" } ] - })); + }, columns_settings); [% END %] }); -- 2.11.0