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

Fix pagination count for task collection

Browse source
This commit is contained in:
kolaente 2020-04-27 19:28:19 +02:00
parent 56dbb564ea
commit fa28ddc2f7
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/models/tasks.go
View file

@ -215,19 +215,23 @@ func getRawTasksForLists(lists []*List, opts *taskOptions) (tasks []*Task, resul
} }
// Then return all tasks for that lists // Then return all tasks for that lists
query := x. query := x.NewSession().
OrderBy(orderby) OrderBy(orderby)
queryCount := x.NewSession()
if len(opts.search) > 0 { if len(opts.search) > 0 {
query = query.Where("text LIKE ?", "%"+opts.search+"%") query = query.Where("text LIKE ?", "%"+opts.search+"%")
queryCount = queryCount.Where("text LIKE ?", "%"+opts.search+"%")
} }
if len(listIDs) > 0 { if len(listIDs) > 0 {
query = query.In("list_id", listIDs) query = query.In("list_id", listIDs)
queryCount = queryCount.In("list_id", listIDs)
} }
if len(filters) > 0 { if len(filters) > 0 {
query = query.Where(builder.Or(filters...)) query = query.Where(builder.Or(filters...))
queryCount = queryCount.Where(builder.Or(filters...))
} }
limit, start := getLimitFromPageIndex(opts.page, opts.perPage) limit, start := getLimitFromPageIndex(opts.page, opts.perPage)
@ -242,7 +246,7 @@ func getRawTasksForLists(lists []*List, opts *taskOptions) (tasks []*Task, resul
return nil, 0, 0, err return nil, 0, 0, err
} }
totalItems, err = query. totalItems, err = queryCount.
Count(&Task{}) Count(&Task{})
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err