From 2a575c37d3b717c29158ba90d82ca7acaa2681dd Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Wed, 25 Dec 2019 16:59:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E5=9C=A8=E5=9F=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0rules=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/secgrouprules.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go index 6b16989e99..1400c88db4 100644 --- a/pkg/compute/models/secgrouprules.go +++ b/pkg/compute/models/secgrouprules.go @@ -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 }