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

Merge pull request #13200 from zhaoxiangchun/fix/zxc-master

Browse Source 
fix(common): ListItemFilter func exec in the end
This commit is contained in:
Zexi Li
2022-01-15 10:41:52 +08:00
committed by GitHub
parent 29b8b123a5 032750b0e8
commit 4935993b85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/db_dispatcher.go
+4 -4
View File
@@ -264,10 +264,6 @@ func listItemQueryFiltersRaw(manager IModelManager,
q = manager.FilterBySystemAttributes(q, userCred, query, queryScope)
q = manager.FilterByHiddenSystemAttributes(q, userCred, query, queryScope)
}
q, err = ListItemFilter(manager, ctx, q, userCred, query)
if err != nil {
return nil, err
}
if query.Contains("export_keys") {
exportKeys, _ := query.GetString("export_keys")
keys := stringutils2.NewSortedStrings(strings.Split(exportKeys, ","))
@@ -305,6 +301,10 @@ func listItemQueryFiltersRaw(manager IModelManager,
return nil, err
}
}
q, err = ListItemFilter(manager, ctx, q, userCred, query)
if err != nil {
return nil, err
}
return q, nil
}