local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix passing sort_by and order_by as query path arrays

Browse source
This commit is contained in:
kolaente 2019-12-07 16:57:19 +01:00
parent 1555f04bd2
commit d483fe8beb
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/models/task_collection.go
View file

@ -30,9 +30,11 @@ type TaskCollection struct {
Lists []*List Lists []*List
// The query parameter to sort by. This is for ex. done, priority, etc. // The query parameter to sort by. This is for ex. done, priority, etc.
SortBy []string `query:"sort_by"` SortBy []string `query:"sort_by"`
SortByArr []string `query:"sort_by[]"`
// The query parameter to order the items by. This can be either asc or desc, with asc being the default. // The query parameter to order the items by. This can be either asc or desc, with asc being the default.
OrderBy []string `query:"order_by"` OrderBy []string `query:"order_by"`
OrderByArr []string `query:"order_by[]"`
web.CRUDable `xorm:"-" json:"-"` web.CRUDable `xorm:"-" json:"-"`
web.Rights `xorm:"-" json:"-"` web.Rights `xorm:"-" json:"-"`
@ -58,6 +60,14 @@ type TaskCollection struct {
// @Router /lists/{listID}/tasks [get] // @Router /lists/{listID}/tasks [get]
func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) { func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
if len(tf.SortByArr) > 0 {
tf.SortBy = append(tf.SortBy, tf.SortByArr...)
}
if len(tf.OrderByArr) > 0 {
tf.OrderBy = append(tf.OrderBy, tf.OrderByArr...)
}
var sort = make([]*sortParam, 0, len(tf.SortBy)) var sort = make([]*sortParam, 0, len(tf.SortBy))
for i, s := range tf.SortBy { for i, s := range tf.SortBy {
param := &sortParam{ param := &sortParam{