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

Merge pull request #1055 from ioito/hotfix/qx-brand-filter

Browse Source 
support filter by OneCloud brand
This commit is contained in:
yunion-ci-robot
2019-06-04 23:37:50 +08:00
committed by GitHub
parent 0b39ff9d31 d121696439
commit f95ee5f0c9
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/managedresource.go
+23 -12
View File
@@ -185,19 +185,30 @@ func managedResourceFilterByAccount(q *sqlchemy.SQuery, query jsonutils.JSONObje
if len(brandStr) > 0 {
queryDict.Remove("brand")
account := CloudaccountManager.Query().SubQuery()
_subq := CloudproviderManager.Query("id")
subq := _subq.Join(account, sqlchemy.Equals(account.Field("id"), _subq.Field("cloudaccount_id"))).
Filter(sqlchemy.Equals(account.Field("brand"), brandStr)).SubQuery()
if len(filterField) == 0 {
q = q.Filter(sqlchemy.In(q.Field("manager_id"), subq))
queryDict.Remove("manager_id")
if brandStr == api.CLOUD_PROVIDER_ONECLOUD {
if len(filterField) == 0 {
q = q.Filter(sqlchemy.IsNullOrEmpty(q.Field("manager_id")))
} else {
sq := subqFunc()
sq = sq.Filter(sqlchemy.IsNullOrEmpty(sq.Field("manager_id")))
q = q.Filter(sqlchemy.In(q.Field(filterField), sq.SubQuery()))
queryDict.Remove(filterField)
}
} else {
sq := subqFunc()
sq = sq.Filter(sqlchemy.In(sq.Field("manager_id"), subq))
q = q.Filter(sqlchemy.In(q.Field(filterField), sq.SubQuery()))
queryDict.Remove(filterField)
account := CloudaccountManager.Query().SubQuery()
_subq := CloudproviderManager.Query("id")
subq := _subq.Join(account, sqlchemy.Equals(account.Field("id"), _subq.Field("cloudaccount_id"))).
Filter(sqlchemy.Equals(account.Field("brand"), brandStr)).SubQuery()
if len(filterField) == 0 {
q = q.Filter(sqlchemy.In(q.Field("manager_id"), subq))
queryDict.Remove("manager_id")
} else {
sq := subqFunc()
sq = sq.Filter(sqlchemy.In(sq.Field("manager_id"), subq))
q = q.Filter(sqlchemy.In(q.Field(filterField), sq.SubQuery()))
queryDict.Remove(filterField)
}
}
}