From 4fe0b3501851a6f5a05645ca76ce9d4287667cc5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 19 Sep 2018 19:45:12 -0300 Subject: [PATCH] Bug 17877: Add columns settings to the orders table on subscription-detail MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Test plan: - Apply this patch and make sure to restart memcached (to re-read the yaml file that is cached) - Go to Home › Administration › Columns settings - Confirm that a new "Serials" tab contain the different columns of the "Acquisition details" table displayed on the subscription detail page (if an order exist for this subscription) - Play with it - Go to Home › Serials › Details for subscription #ID - Confirm that the "Column visibility" button is now displayed on top of the table that it works correctly. Signed-off-by: Séverine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- admin/columns_settings.yml | 22 +++++++++++++++++++ .../prog/en/modules/admin/columns_settings.tt | 6 +++++ .../en/modules/serials/subscription-detail.tt | 7 ++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index a76acc0112..0a4f66ffc3 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -592,3 +592,25 @@ modules: columnname: serial_status - columnname: serial_notes + + serials: + subscription-detail: + orders: + - + columnname: invoice + - + columnname: basket + - + columnname: ordernumber + - + columnname: creation_date + - + columnname: receive_date + - + columnname: status + - + columnname: fund + - + columnname: ordered + - + columnname: spent diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index b41b653533..ebcd53e1c0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -158,6 +158,12 @@ [% PROCESS pagelist module=modules.reports modulename="reports" %] +

Serials

+
+

Serials tables

+ [% PROCESS pagelist module=modules.serials modulename="serials" %] +
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index e8e8364161..498ceb2ca5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -5,6 +5,7 @@ [% USE Branches %] [% USE AuthorisedValues %] [% USE Price %] +[% USE ColumnsSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Details for subscription #[% subscriptionid | html %] @@ -420,6 +421,7 @@ [% Asset.js("js/serials-toolbar.js") | $raw %] [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %]