Merge pull request #4313 from ioito/bugfix/qx-domain-secgrouprule

fix: 避免在域管理后台rules不可见
This commit is contained in:
yunion-ci-robot
2019-12-26 01:54:14 +08:00
committed by GitHub
+1 -7
View File
@@ -115,13 +115,7 @@ func (manager *SSecurityGroupRuleManager) FilterByOwner(q *sqlchemy.SQuery, user
if userCred != nil {
sq := SecurityGroupManager.Query("id")
ssq := SecurityGroupManager.FilterByOwner(sq, userCred, scope)
switch scope {
case rbacutils.ScopeProject:
return q.In("secgroup_id", ssq.SubQuery())
case rbacutils.ScopeDomain:
sq = sq.Equals("domain_id", userCred.GetProjectDomainId())
return q.In("secgroup_id", ssq.SubQuery())
}
return q.In("secgroup_id", ssq.SubQuery())
}
return q
}