leggettc18
/
api
forked from vikunja/vikunja
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pagination count for task collection

This commit is contained in:
kolaente 2020-04-27 19:28:19 +02:00
parent 56dbb564ea
commit fa28ddc2f7
Signed by untrusted user: konrad
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
query := x.
query := x.NewSession().
OrderBy(orderby)
queryCount := x.NewSession()
if len(opts.search) > 0 {
query = query.Where("text LIKE ?", "%"+opts.search+"%")
queryCount = queryCount.Where("text LIKE ?", "%"+opts.search+"%")
}
if len(listIDs) > 0 {
query = query.In("list_id", listIDs)
queryCount = queryCount.In("list_id", listIDs)
}
if len(filters) > 0 {
query = query.Where(builder.Or(filters...))
queryCount = queryCount.Where(builder.Or(filters...))
}
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
}
totalItems, err = query.
totalItems, err = queryCount.
Count(&Task{})
if err != nil {
return nil, 0, 0, err