From 826f01ec712bf3204833c8af1a24b59e2b31d64a Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Thu, 7 Nov 2024 13:24:00 +0000 Subject: [PATCH] Bug 38010: Rebase for bug 38390 Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart --- api/v1/swagger/paths/acquisitions_vendors.yaml | 2 +- .../prog/js/fetch/acquisition-api-client.js | 2 +- .../prog/js/vue/components/Vendors/VendorFormAdd.vue | 1 + .../prog/js/vue/components/Vendors/VendorList.vue | 10 +++++----- .../js/vue/components/Vendors/VendorSubscriptions.vue | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/api/v1/swagger/paths/acquisitions_vendors.yaml b/api/v1/swagger/paths/acquisitions_vendors.yaml index 98980dc757f..52463cd1493 100644 --- a/api/v1/swagger/paths/acquisitions_vendors.yaml +++ b/api/v1/swagger/paths/acquisitions_vendors.yaml @@ -149,7 +149,7 @@ enum: - aliases - baskets - - subscriptions + - subscriptions+count - interfaces - contacts - contracts diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js index bfbe15f742f..06467777f91 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js +++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js @@ -12,7 +12,7 @@ export class AcquisitionAPIClient { endpoint: "vendors/" + id, headers: { "x-koha-embed": - "aliases,subscriptions,interfaces,contacts,contracts", + "aliases,subscriptions+count,interfaces,contacts,contracts", }, }), getAll: (query, params) => diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue index 58ebab686f9..d8f60195084 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue @@ -112,6 +112,7 @@ export default { }); } delete vendor.physical; + delete vendor.subscriptions_count; vendor.contacts = vendor.contacts.map( ({ id, booksellerid, ...requiredProperties }) => 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 b6cc8c62ecc..d22798c1f0e 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 @@ -62,7 +62,7 @@ export default { searchTerm: null, tableOptions: { columns: this.getTableColumns(), - options: { embed: "aliases,baskets,subscriptions" }, + options: { embed: "aliases,baskets,subscriptions+count" }, url: () => this.tableURL(), add_filters: true, filters_options: { @@ -85,8 +85,8 @@ export default { should_display: row => (!row.baskets || row.baskets.length === 0) && - (!row.subscriptions || - row.subscriptions.length === 0), + (!row.subscriptions_count || + row.subscriptions_count === 0), }, }, ], @@ -234,13 +234,13 @@ export default { searchable: false, orderable: false, render(data, type, row, meta) { - return row.subscriptions.length + return row.subscriptions_count ? '' + escape_str( - `${row.subscriptions.length} subscription(s)` + `${row.subscriptions_count} subscription(s)` ) + "" : escape_str(__("No subscriptions")); diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue index e6e31a8343a..bfc1a6ede32 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorSubscriptions.vue @@ -8,9 +8,9 @@ {{ vendor.subscriptions.length }}{{ vendor.subscriptions_count }} - {{ vendor.subscriptions.length }} + {{ vendor.subscriptions_count }}

-- 2.34.1