apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Show display text instead of name (#4831)

Browse Source
This commit is contained in:
Hoang Nguyen 2021-03-18 14:43:18 +07:00 committed by GitHub
parent b658cf12d0
commit d105d6a770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
View File

@ -237,7 +237,7 @@
<a-select-option <a-select-option
v-for="networkOffering in availableNetworkOfferings" v-for="networkOffering in availableNetworkOfferings"
:key="networkOffering.id"> :key="networkOffering.id">
{{ networkOffering.name }} {{ networkOffering.displaytext || networkOffering.name || networkOffering.description }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

2
ui/src/views/network/CreateIsolatedNetworkForm.vue
View File

@ -125,7 +125,7 @@
:placeholder="this.$t('label.networkofferingid')" :placeholder="this.$t('label.networkofferingid')"
@change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }"> @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }">
<a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex"> <a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex">
{{ opt.name || opt.description }} {{ opt.displaytext || opt.name || opt.description }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

2
ui/src/views/network/CreateL2NetworkForm.vue
View File

@ -125,7 +125,7 @@
:placeholder="this.$t('label.networkofferingid')" :placeholder="this.$t('label.networkofferingid')"
@change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }"> @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }">
<a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex"> <a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex">
{{ opt.name || opt.description }} {{ opt.displaytext || opt.name || opt.description }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

6
ui/src/views/network/CreateNetwork.vue
View File

@ -74,11 +74,6 @@ export default {
actionZoneLoading: false actionZoneLoading: false
} }
}, },
watch: {
resource (newItem, oldItem) {
this.fetchData()
}
},
created () { created () {
const promises = [] const promises = []
promises.push(this.fetchActionZoneData()) promises.push(this.fetchActionZoneData())
@ -113,7 +108,6 @@ export default {
}) })
}, },
handleRefresh () { handleRefresh () {
this.fetchData()
}, },
refreshParent () { refreshParent () {
this.$emit('refresh-data') this.$emit('refresh-data')

2
ui/src/views/network/CreateSharedNetworkForm.vue
View File

@ -284,7 +284,7 @@
:placeholder="this.$t('label.networkofferingid')" :placeholder="this.$t('label.networkofferingid')"
@change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }"> @change="val => { this.handleNetworkOfferingChange(this.networkOfferings[val]) }">
<a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex"> <a-select-option v-for="(opt, optIndex) in this.networkOfferings" :key="optIndex">
{{ opt.name || opt.description }} {{ opt.displaytext || opt.name || opt.description }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>

2
ui/src/views/network/VpcTiersTab.vue
View File

@ -170,7 +170,7 @@
<a-select <a-select
v-decorator="['networkOffering',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"> v-decorator="['networkOffering',{rules: [{ required: true, message: `${$t('label.required')}` }]}]">
<a-select-option v-for="item in networkOfferings" :key="item.id" :value="item.id"> <a-select-option v-for="item in networkOfferings" :key="item.id" :value="item.id">
{{ item.name }} {{ item.displaytext || item.name || item.description }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>