etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.17'

This commit is contained in:
nvazquez 2022-06-09 07:32:26 -03:00
parent e20a57dc13 aae0fae950
commit 64262d943f
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/src/views/compute/DeployVM.vue
View File

@ -180,6 +180,7 @@
<a-form-item :label="$t('label.hypervisor')">
<a-select
v-model:value="form.hypervisor"
:preFillContent="dataPreFill"
:options="hypervisorSelectOptions"
@change="value => hypervisor = value"
showSearch
@ -1974,7 +1975,9 @@ export default {
this.options[name] = response
if (name === 'hypervisors') {
this.hypervisor = response[0] && response[0].name ? response[0].name : null
const hypervisorFromResponse = response[0] && response[0].name ? response[0].name : null
this.dataPreFill.hypervisor = hypervisorFromResponse
this.form.hypervisor = hypervisorFromResponse
}
if (param.field) {

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

@ -187,7 +187,7 @@
</a-form-item>
<a-form-item :label="$t('label.associatednetwork')" ref="associatednetworkid" name="associatednetworkid">
<a-select
v-model:value="form.associatednetwork"
v-model:value="form.associatednetworkid"
showSearch
optionFilterProp="label"
:filterOption="(input, option) => {
@ -738,8 +738,8 @@ export default {
if (data.vlan && String(data.vlan).length > 0) {
params.vlan = data.vlan
}
if (data.associatednetwork) {
params.associatednetworkid = data.associatednetwork
if (data.associatednetworkid) {
params.associatednetworkid = data.associatednetworkid
}
api('createPrivateGateway', params).then(response => {