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

Merge pull request #5534 from swordqiu/hotfix/qj-list-get-field-filter-not-working

Browse Source 
fix: list/get field filter not working properly
This commit is contained in:
yunion-ci-robot
2020-03-16 13:46:14 +08:00
committed by GitHub
parent eff67b5e27 284f68b48f
commit 99cbd18b81
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+10 -2
View File
@@ -410,7 +410,11 @@ func Query2List(manager IModelManager, ctx context.Context, userCred mcclient.To
}
results := make([]jsonutils.JSONObject, len(items))
if showDetails && !query.Contains("export_keys") {
extraRows, err := FetchCustomizeColumns(manager, ctx, userCred, query, items, stringutils2.NewSortedStrings(fieldFilter), true)
var sortedListFields stringutils2.SSortedStrings
if len(fieldFilter) > 0 {
sortedListFields = stringutils2.NewSortedStrings(fieldFilter)
}
extraRows, err := FetchCustomizeColumns(manager, ctx, userCred, query, items, sortedListFields, true)
if err != nil {
return nil, errors.Wrap(err, "FetchCustomizeColumns")
@@ -817,7 +821,11 @@ func getItemDetails(manager IModelManager, item IModel, ctx context.Context, use
// extraDict.Update(jsonDict)
// jsonDict = getModelExtraDetails(item, ctx, jsonDict)
extraRows, err := FetchCustomizeColumns(manager, ctx, userCred, query, []interface{}{item}, stringutils2.NewSortedStrings(fieldFilter), false)
var sortedListFields stringutils2.SSortedStrings
if len(fieldFilter) > 0 {
sortedListFields = stringutils2.NewSortedStrings(fieldFilter)
}
extraRows, err := FetchCustomizeColumns(manager, ctx, userCred, query, []interface{}{item}, sortedListFields, false)
if err != nil {
return nil, errors.Wrap(err, "FetchCustomizeColumns")
}