diff --git a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue index e44d3347a365..9650fd404d59 100644 --- a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue +++ b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue @@ -237,7 +237,7 @@ - {{ networkOffering.name }} + {{ networkOffering.displaytext || networkOffering.name || networkOffering.description }} diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue index b40c241b5c1a..136e1a598672 100644 --- a/ui/src/views/network/CreateIsolatedNetworkForm.vue +++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue @@ -125,7 +125,7 @@ :placeholder="this.$t('label.networkofferingid')" @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }"> - {{ opt.name || opt.description }} + {{ opt.displaytext || opt.name || opt.description }} diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue index b21bce0b1f8d..9d48a80186fb 100644 --- a/ui/src/views/network/CreateL2NetworkForm.vue +++ b/ui/src/views/network/CreateL2NetworkForm.vue @@ -125,7 +125,7 @@ :placeholder="this.$t('label.networkofferingid')" @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }"> - {{ opt.name || opt.description }} + {{ opt.displaytext || opt.name || opt.description }} diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue index 0c62041ec342..29a1c151379b 100644 --- a/ui/src/views/network/CreateNetwork.vue +++ b/ui/src/views/network/CreateNetwork.vue @@ -74,11 +74,6 @@ export default { actionZoneLoading: false } }, - watch: { - resource (newItem, oldItem) { - this.fetchData() - } - }, created () { const promises = [] promises.push(this.fetchActionZoneData()) @@ -113,7 +108,6 @@ export default { }) }, handleRefresh () { - this.fetchData() }, refreshParent () { this.$emit('refresh-data') diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue b/ui/src/views/network/CreateSharedNetworkForm.vue index e91a5631c4af..9b020c18c5c9 100644 --- a/ui/src/views/network/CreateSharedNetworkForm.vue +++ b/ui/src/views/network/CreateSharedNetworkForm.vue @@ -284,7 +284,7 @@ :placeholder="this.$t('label.networkofferingid')" @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }"> - {{ opt.name || opt.description }} + {{ opt.displaytext || opt.name || opt.description }} diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue index ae67a8f87a2e..08a4533d2bb1 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -170,7 +170,7 @@ - {{ item.name }} + {{ item.displaytext || item.name || item.description }}