From 1a23443e8acc8cdf02b403734074b96f0fecd908 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Thu, 24 Oct 2024 14:00:46 +0000 Subject: [PATCH] Bug 38256: Update the UI to handle the new vendor field (cherry picked from commit c4f308ed64ffc0420b1ced1426925ac84cac54ce) --- .../intranet-tmpl/prog/js/fetch/erm-api-client.js | 4 +++- .../ERM/UsageStatisticsDataProviderDetails.vue | 10 ++++++++++ .../ERM/UsageStatisticsDataProvidersFormAdd.vue | 12 ++++++++++++ .../ERM/UsageStatisticsDataProvidersShow.vue | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/erm-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/erm-api-client.js index b618e0d672b..6adc86b1218 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/fetch/erm-api-client.js +++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/erm-api-client.js @@ -259,12 +259,14 @@ export class ERMAPIClient { get: id => this.httpClient.get({ endpoint: "usage_data_providers/" + id, + headers: { + "x-koha-embed": "vendor", + }, }), getAll: query => this.httpClient.getAll({ endpoint: "usage_data_providers", query, - query, }), delete: id => this.httpClient.delete({ diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue index c418dd201f9..32aa5df6e6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProviderDetails.vue @@ -14,6 +14,16 @@ {{ usage_data_provider.description }} +
  • + + + + {{ usage_data_provider.vendor.name }} + + +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue index aebcf54092a..33097c4fb0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersFormAdd.vue @@ -95,6 +95,15 @@ :disabled="!selected_provider && !manual_form" />
  • +
  • + + +
  • import ButtonSubmit from "../ButtonSubmit.vue"; +import FormSelectVendors from "../FormSelectVendors.vue"; import { setMessage, setWarning } from "../../messages"; import { APIClient } from "../../fetch/api-client.js"; import { inject } from "vue"; @@ -405,6 +415,7 @@ export default { erm_usage_data_provider_id: null, name: "", description: "", + vendor_id: null, active: 1, method: "", aggregator: "", @@ -622,6 +633,7 @@ export default { }, components: { ButtonSubmit, + FormSelectVendors, }, name: "UsageStatisticsDataProvidersFormAdd", }; diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue index 863bda22e6e..0fb6e04b78f 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsDataProvidersShow.vue @@ -157,6 +157,7 @@ export default { requestor_name: "", requestor_email: "", report_types: [], + vendor: null, }, initialized: false, tab_content: "detail", -- 2.48.1