Merge pull request #10689 from ioito/automated-cherry-pick-of-#10688-upstream-release-3.7

Automated cherry pick of #10688: fix: actions domain filter by project doamin id
This commit is contained in:
Zexi Li
2021-04-12 13:17:06 +08:00
committed by GitHub
+1 -1
View File
@@ -394,7 +394,7 @@ func (self *SOpsLogManager) FilterByOwner(q *sqlchemy.SQuery, ownerId mcclient.I
}
case rbacutils.ScopeDomain:
if len(ownerId.GetProjectDomainId()) > 0 {
q = q.Filter(sqlchemy.Equals(q.Field("domain_id"), ownerId.GetProjectDomainId()))
q = q.Filter(sqlchemy.Equals(q.Field("project_domain_id"), ownerId.GetProjectDomainId()))
}
default:
// systemScope, no filter