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

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit '8939e971b6cbcfce69bcbbcfadc2ebab33fc00b5':
  support filter attached disk
This commit is contained in:
邱剑
2018-09-11 21:51:59 +08:00
parent 786489162b 8939e971b6
commit c2ba894926
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/disks.go
+7 -2
View File
@@ -108,11 +108,16 @@ func (manager *SDiskManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
if !ok {
return nil, fmt.Errorf("Invalid querystring formst: %v", query)
}
if jsonutils.QueryBoolean(query, "unused", false) {
if query.Contains("unused") {
guestdisks := GuestdiskManager.Query().SubQuery()
sq := guestdisks.Query(guestdisks.Field("disk_id"))
q = q.Filter(sqlchemy.NotIn(q.Field("id"), sq))
if jsonutils.QueryBoolean(query, "unused", false) {
q = q.Filter(sqlchemy.NotIn(q.Field("id"), sq))
} else {
q = q.Filter(sqlchemy.In(q.Field("id"), sq))
}
}
storages := StorageManager.Query().SubQuery()
if jsonutils.QueryBoolean(query, "share", false) {
sq := storages.Query(storages.Field("id")).Filter(sqlchemy.NotIn(storages.Field("storage_type"), STORAGE_LOCAL_TYPES))