From c64177d924edcce971f33b52ad48f45d1d86dbbc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 7 Mar 2023 17:04:01 +0100 Subject: [PATCH] Bug 33066: Use KohaTable for LicensesList MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bug 33066: (follow-up) Use KohaTable for LicensesList There was a mismatch, we can embed the whole vendor object info. Signed-off-by: Pedro Amorim Signed-off-by: Agustín Moyano Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1c03ff77b272eada4859569389cc37c7e0a0c583) Signed-off-by: Martin Renvoize --- api/v1/swagger/paths/erm_licenses.yaml | 2 +- .../js/vue/components/ERM/AgreementsList.vue | 2 +- .../js/vue/components/ERM/LicensesList.vue | 349 ++++++------------ .../prog/js/vue/fetch/erm-api-client.js | 2 +- 4 files changed, 118 insertions(+), 237 deletions(-) diff --git a/api/v1/swagger/paths/erm_licenses.yaml b/api/v1/swagger/paths/erm_licenses.yaml index bca05a2b87..97a6752798 100644 --- a/api/v1/swagger/paths/erm_licenses.yaml +++ b/api/v1/swagger/paths/erm_licenses.yaml @@ -59,7 +59,7 @@ items: type: string enum: - - vendor.name + - vendor responses: 200: description: A list of agreements' licenses diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue index b81ccb04d3..0606a1db49 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -50,7 +50,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/erm-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/erm-api-client.js index 9cd4e8e761..a78810bb4e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/erm-api-client.js +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/fetch/erm-api-client.js @@ -62,7 +62,7 @@ export class ERMAPIClient extends HttpClient { this.get({ endpoint: "licenses?" + (query || "_per_page=-1"), headers: { - "x-koha-embed": "vendor.name", + "x-koha-embed": "vendor", }, }), delete: (id) => -- 2.39.5