From ba9c4999af2ff54ffd45b52af0f478d4ac6bbb0b Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 6 May 2025 11:03:46 +0100 Subject: [PATCH] Bug 38010: (follow-up) Make vendor table columns configurable --- admin/columns_settings.yml | 21 +++++++++++++++++++ .../prog/en/modules/acqui/vendors.tt | 4 +++- .../js/vue/components/Vendors/VendorList.vue | 4 +++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index e2293a99300..bb1db657a5b 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -254,6 +254,27 @@ modules: columnname: actions cannot_be_toggled: 1 cannot_be_modified: 1 + + vendors: + vendors: + columns: + - + columnname: name + - + columnname: status + - + columnname: type + - + columnname: invoice_currency + - + columnname: baskets + - + columnname: subscriptions + - + columnname: actions + cannot_be_toggled: 1 + cannot_be_modified: 1 + admin: cities: table_cities: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt index 822f5940b1c..16c6de85eed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt @@ -30,7 +30,9 @@ [% INCLUDE 'js-patron-format.inc' %] [% INCLUDE 'js-date-format.inc' %] [% INCLUDE 'format_price.inc' %] - + [% Asset.js("js/vue/dist/acquisitions.js") | $raw %] [% INCLUDE 'select2.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue index 1441e21c5c2..6ae9a271084 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue @@ -56,6 +56,7 @@ export default { setMessage, escape_str, isUserPermitted, + vendorTableSettings }; }, data() { @@ -70,6 +71,7 @@ export default { embed: "aliases,baskets+count,subscriptions+count,invoices+count", }, url: () => this.tableURL(), + table_settings: this.vendorTableSettings, add_filters: true, filters_options: { 1: [ @@ -227,7 +229,7 @@ export default { }, }, { - title: __("Currency"), + title: __("Invoice currency"), data: "invoice_currency", searchable: true, orderable: true, -- 2.48.1