opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-12 17:10:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): cloud provider filter by domain_id ignore private case

Browse Source
This commit is contained in:
Qiu Jian
2021-03-12 20:11:49 +08:00
parent c11ecbd566
commit 18d495f108
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudproviders.go
+4
View File
@@ -1516,6 +1516,10 @@ func (manager *SCloudproviderManager) filterByDomainId(q *sqlchemy.SQuery, domai
sqlchemy.AND(
sqlchemy.Equals(cloudaccounts.Field("share_mode"), api.CLOUD_ACCOUNT_SHARE_MODE_SYSTEM),
sqlchemy.OR(
sqlchemy.AND(
sqlchemy.Equals(cloudaccounts.Field("public_scope"), rbacutils.ScopeNone),
sqlchemy.Equals(cloudaccounts.Field("domain_id"), domainId),
),
sqlchemy.AND(
sqlchemy.Equals(cloudaccounts.Field("public_scope"), rbacutils.ScopeDomain),
sqlchemy.OR(