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 #10437 from swordqiu/hotfix/qj-scoped-policy-filter-by-project-id

Browse Source 
fix(region): scoped policy filter by project id
This commit is contained in:
Zexi Li
2021-03-18 10:23:51 +08:00
committed by GitHub
parent c631353bfa 7613e287ed
commit bb7712920b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yunionconf/models/scopedpolicybindings.go
+4 -1
View File
@@ -258,7 +258,10 @@ func filterByOwnerId(q *sqlchemy.SQuery, domainId, projectId string, effective b
if len(projectId) > 0 {
q = q.Filter(sqlchemy.OR(
sqlchemy.AND(sqlchemy.IsNullOrEmpty(q.Field("domain_id")), sqlchemy.IsNullOrEmpty(q.Field("project_id"))),
sqlchemy.AND(sqlchemy.Equals(q.Field("domain_id"), api.ANY_DOMAIN_ID), sqlchemy.Equals(q.Field("project_id"), api.ANY_PROJECT_ID)),
sqlchemy.AND(sqlchemy.Equals(q.Field("domain_id"), api.ANY_DOMAIN_ID), sqlchemy.OR(
sqlchemy.Equals(q.Field("project_id"), api.ANY_PROJECT_ID),
sqlchemy.IsNullOrEmpty(q.Field("project_id")),
)),
sqlchemy.AND(sqlchemy.Equals(q.Field("domain_id"), domainId), sqlchemy.OR(
sqlchemy.IsNullOrEmpty(q.Field("project_id")),
sqlchemy.Equals(q.Field("project_id"), api.ANY_PROJECT_ID),