From 4a85a5101467f72d9055d2e7f5b27e84b1c7251c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 1 Mar 2023 14:03:38 +0100
Subject: [PATCH] Bug 33103: Display the aliases in the dropdown list in ERM

Signed-off-by: Jonathan Field <jonathan.field@ptfs-europe.com>
---
 .../prog/js/vue/components/ERM/AgreementsFormAdd.vue |  2 +-
 .../components/ERM/EHoldingsLocalPackagesFormAdd.vue |  2 +-
 .../ERM/EHoldingsLocalTitlesFormAddResources.vue     |  2 +-
 .../prog/js/vue/components/ERM/LicensesFormAdd.vue   |  2 +-
 .../prog/js/vue/components/ERM/Main.vue              | 12 ++++++++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
index 7720370b00..92ad832241 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue
@@ -31,7 +31,7 @@
                                 <v-select
                                     id="agreement_vendor_id"
                                     v-model="agreement.vendor_id"
-                                    label="name"
+                                    label="display_name"
                                     :reduce="vendor => vendor.id"
                                     :options="vendors"
                                 />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
index c227105e71..ee47c06ad2 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue
@@ -28,7 +28,7 @@
                             <v-select
                                 id="package_vendor_id"
                                 v-model="erm_package.vendor_id"
-                                label="name"
+                                label="display_name"
                                 :reduce="vendor => vendor.id"
                                 :options="vendors"
                             />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue
index fe6ae050e6..badeeee673 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAddResources.vue
@@ -46,7 +46,7 @@
                     <v-select
                         :id="`resource_vendor_id_${counter}`"
                         v-model="resource.vendor_id"
-                        label="name"
+                        label="display_name"
                         :reduce="vendor => vendor.id"
                         :options="vendors"
                     />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
index 14b42290f1..c1891374ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue
@@ -31,7 +31,7 @@
                                 <v-select
                                     id="license_vendor_id"
                                     v-model="license.vendor_id"
-                                    label="name"
+                                    label="display_name"
                                     :reduce="vendor => vendor.id"
                                     :options="vendors"
                                 />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
index 57d43c9d54..7de5c0ed78 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue
@@ -157,8 +157,16 @@ export default {
         const client = APIClient.acquisition
         client.vendors.getAll().then(
             vendors => {
-                this.vendorStore.vendors = vendors
-                this.initialized = true
+                this.vendorStore.vendors = vendors.map(v => ({
+                    ...v,
+                    display_name:
+                        v.name +
+                        (v.aliases.length > 0
+                            ? " (" +
+                              v.aliases.map(a => a.alias).join(", ") +
+                              ")"
+                            : ""),
+                }))
             },
             error => {}
         )
-- 
2.30.2