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 #5373 from swordqiu/automated-cherry-pick-of-#5372-upstream-release-3.1

Browse Source 
Automated cherry pick of #5372: fix: no scope shcedtag should be visible to all
This commit is contained in:
Zexi Li
2020-03-06 18:32:28 +08:00
committed by GitHub
parent 8d1c0ba9c9 6c15c80abb
commit f9a9f92003
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/scoperesource.go
+8 -2
View File
@@ -44,9 +44,15 @@ func (m *SScopedResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, userCred
}
switch scope {
case rbacutils.ScopeDomain:
q = q.Filter(sqlchemy.Equals(q.Field("domain_id"), userCred.GetDomainId()))
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("domain_id"), userCred.GetDomainId()),
sqlchemy.IsNullOrEmpty(q.Field("domain_id")),
))
case rbacutils.ScopeProject:
q = q.Filter(sqlchemy.Equals(q.Field("tenant_id"), userCred.GetProjectId()))
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("tenant_id"), userCred.GetProjectId()),
sqlchemy.IsNullOrEmpty(q.Field("tenant_id")),
))
}
return q
}