lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-24 20:40:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: turn on default column filter ONLY if query variable starts with @

Browse Source
This commit is contained in:
Qiu Jian
2020-03-05 12:04:51 +08:00
parent 1b407cc0c0
commit a32afca7df
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cloudcommon/db/db_dispatcher.go
View File

@@ -120,12 +120,15 @@ func listItemsQueryByColumn(manager IModelManager, q *sqlchemy.SQuery, userCred
}
qdata, err := query.GetMap()
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "query.GetMap %s", query.String())
}
listF := searchFields(manager, userCred)
for key := range qdata {
fn, op := parseSearchFieldkey(key)
if !strings.HasPrefix(key, "@") {
continue
}
fn, op := parseSearchFieldkey(key[1:])
if listF.Contains(fn) {
colSpec := manager.TableSpec().ColumnSpec(fn)
if colSpec != nil {
@@ -270,13 +273,16 @@ func listItemQueryFiltersRaw(manager IModelManager,
return nil, err
}
}
// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
// TURN OFF automatic query by column name!!!!
// TURN ON automatic filter by column name, ONLY if query key starts with @!!!!
// example: @name=abc&@city=111
// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
/*q, err = listItemsQueryByColumn(manager, q, userCred, query)
q, err = listItemsQueryByColumn(manager, q, userCred, query)
if err != nil {
return nil, err
}*/
}
searches := jsonutils.GetQueryStringArray(query, "search")
if len(searches) > 0 {
q, err = applyListItemsSearchFilters(manager, ctx, q, userCred, searches)