opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor updates

Browse Source
This commit is contained in:
Qiu Jian
2019-03-16 20:29:04 +08:00
parent b7d5746197
commit bd94daec0c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+11 -9
View File
@@ -182,22 +182,24 @@ func (self *SCloudaccount) ValidateUpdateData(ctx context.Context, userCred mccl
data.Set("sync_interval_seconds", jsonutils.NewInt(syncIntervalSecs))
}
if data.Contains("options") || data.Contains("remove_options") {
toRemoveKeys, _ := data.GetArray("remove_options")
removes := make([]string, 0)
if len(toRemoveKeys) > 0 {
for i := range toRemoveKeys {
key, _ := toRemoveKeys[i].GetString()
removes = append(removes, key)
}
}
var optionsJson *jsonutils.JSONDict
if self.Options != nil {
toRemoveKeys, _ := data.GetArray("remove_options")
removes := make([]string, 0)
if len(toRemoveKeys) > 0 {
for i := range toRemoveKeys {
key, _ := toRemoveKeys[i].GetString()
removes = append(removes, key)
}
}
optionsJson = self.Options.CopyExcludes(removes...)
} else {
optionsJson = jsonutils.NewDict()
}
toUpdate, _ := data.Get("options")
optionsJson.Update(toUpdate)
if toUpdate != nil {
optionsJson.Update(toUpdate)
}
data.Set("options", optionsJson)
}
return self.SEnabledStatusStandaloneResourceBase.ValidateUpdateData(ctx, userCred, query, data)