opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix share resource left join

Browse Source
This commit is contained in:
wanyaoqi
2019-06-16 23:22:44 +08:00
parent a255a780fe
commit 921f032fe1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/sharablevirtual.go
+6 -5
View File
@@ -54,8 +54,10 @@ func (manager *SSharableVirtualResourceBaseManager) FilterByOwner(q *sqlchemy.SQ
case rbacutils.ScopeProject:
ownerProjectid := owner.GetProjectId()
if len(ownerProjectid) > 0 {
rq := SharedResourceManager.Query().SubQuery()
q.LeftJoin(rq, sqlchemy.Equals(q.Field("id"), rq.Field("resource_id")))
subq := SharedResourceManager.Query("resource_id")
subq = subq.Equals("resource_type", manager.Keyword())
subq = subq.Equals("target_project_id", ownerProjectid)
subq = subq.Equals("owner_project_id", q.Field("tenant_id"))
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("tenant_id"), ownerProjectid),
sqlchemy.AND(
@@ -68,9 +70,8 @@ func (manager *SSharableVirtualResourceBaseManager) FilterByOwner(q *sqlchemy.SQ
sqlchemy.Equals(q.Field("domain_id"), owner.GetProjectDomainId()),
),
sqlchemy.AND(
sqlchemy.Equals(rq.Field("resource_type"), manager.Keyword()),
sqlchemy.Equals(rq.Field("target_project_id"), ownerProjectid),
sqlchemy.Equals(q.Field("tenant_id"), rq.Field("owner_project_id")),
sqlchemy.IsFalse(q.Field("is_public")),
sqlchemy.In(q.Field("id"), subq.SubQuery()),
),
))
}