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

Merge pull request #10403 from swordqiu/automated-cherry-pick-of-#10402-upstream-release-3.7

Browse Source 
Automated cherry pick of #10402: fix(region): cloud provider filter by domain_id ignore private case
This commit is contained in:
Zexi Li
2021-03-12 21:17:15 +08:00
committed by GitHub
parent a5613c8ed5 72e805ab92
commit 0f4d76abb8
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(