Bugzilla – Attachment 183025 Details for
Bug 38256
Link vendors to ERM data providers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38256: Update the UI to handle the new vendor field
Bug-38256-Update-the-UI-to-handle-the-new-vendor-f.patch (text/plain), 5.16 KB, created by
David Nind
on 2025-06-06 02:16:20 UTC
(
hide
)
Description:
Bug 38256: Update the UI to handle the new vendor field
Filename:
MIME Type:
Creator:
David Nind
Created:
2025-06-06 02:16:20 UTC
Size:
5.16 KB
patch
obsolete
>From d7da31dd95865b559737c19a8fa6043ccb7c0e52 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >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) >Signed-off-by: David Nind <david@davidnind.com> >--- > .../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 b618e0d672..6adc86b121 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 c418dd201f..32aa5df6e6 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 }} > </span> > </li> >+ <li v-if="usage_data_provider.vendor_id"> >+ <label>{{ $__("Vendor") }}:</label> >+ <span v-if="usage_data_provider.vendor_id"> >+ <a >+ :href="`/cgi-bin/koha/acquisition/vendors/${usage_data_provider.vendor_id}`" >+ > >+ {{ usage_data_provider.vendor.name }} >+ </a> >+ </span> >+ </li> > <li> > <label>{{ $__("Status") }}:</label> > <span id="harvester_status"> >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 aebcf54092..33097c4fb0 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" > /> > </li> >+ <li> >+ <label for="usage_data_provider_vendor_id" >+ >{{ $__("Vendor") }}:</label >+ > >+ <FormSelectVendors >+ id="usage_data_provider_vendor_id" >+ v-model="usage_data_provider.vendor_id" >+ /> >+ </li> > <li> > <label for="usage_data_provider_status" > >{{ $__("Harvester status") }}:</label >@@ -385,6 +394,7 @@ > > <script> > 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 863bda22e6..0fb6e04b78 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.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38256
:
175150
|
175151
|
175152
|
175153
|
182592
|
182593
|
182594
|
182595
|
183022
|
183023
|
183024
| 183025