Merge remote-tracking branch 'origin/4.17'

This commit is contained in:
Rohit Yadav 2022-07-29 14:15:47 +02:00
commit c938bae8c6
2 changed files with 5 additions and 2 deletions

View File

@ -1746,6 +1746,9 @@ export default {
}
if (!this.serviceOffering.diskofferingstrictness && values.overridediskofferingid) {
deployVmData.overridediskofferingid = values.overridediskofferingid
if (values.rootdisksize && values.rootdisksize > 0) {
deployVmData.rootdisksize = values.rootdisksize
}
}
if (this.isCustomizedIOPS) {
deployVmData['details[0].minIops'] = this.minIops

View File

@ -1281,8 +1281,8 @@ export default {
}
},
setFormRules () {
this.form = {}
this.rules = {}
this.form = reactive({})
this.rules = reactive({})
this.currentAction.fieldParams.forEach(field => {
this.rules[field.name] = []
const rule = {}