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

Automatic merge from release/2.6.0 -> master

Browse Source 
* commit 'b78b90b99506863c822509bc25cc51cfe2cd4202':
  补充误删的access_url check
This commit is contained in:
邱剑
2019-01-19 15:21:26 +08:00
parent 517b5d5630 b78b90b995
commit 5b7c7ab244
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+1 -2
View File
@@ -256,12 +256,11 @@ func (self *SCloudaccount) PerformUpdateCredential(ctx context.Context, userCred
}
changed := false
// secret, _ := data.GetString("secret")
// account, _ := data.GetString("account")
if len(account.Secret) > 0 || len(account.Account) > 0 {
// check duplication
q := self.GetModelManager().Query()
q = q.Equals("account", account.Account)
q = q.Equals("access_url", self.AccessUrl)
q = q.NotEquals("id", self.Id)
if q.Count() > 0 {
return nil, httperrors.NewConflictError("account %s conflict", account.Account)