vikunja
/
vikunja
6
43
Fork 72
Code Issues 151 Pull Requests 19 Packages Releases 32 Activity

Task filters #243

Merged
konrad merged 18 commits from feature/task-filter into master 2020-04-11 14:20:34 +00:00
Conversation 0 Commits 18 Files Changed 50 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e1d54b9e4 - Show all commits

4
pkg/models/tasks.go
View File

@ -188,7 +188,7 @@ func getRawTasksForLists(lists []*List, opts *taskOptions) (taskMap map[int64]*T
err := x.In("list_id", listIDs).
Where("text LIKE ?", "%"+opts.search+"%").
And(filters).
Where(builder.And(filters...)).
OrderBy(orderby).
Limit(getLimitFromPageIndex(opts.page, opts.perPage)).
Find(&taskMap)
@ -198,7 +198,7 @@ func getRawTasksForLists(lists []*List, opts *taskOptions) (taskMap map[int64]*T
totalItems, err = x.In("list_id", listIDs).
Where("text LIKE ?", "%"+opts.search+"%").
And(filters).
Where(builder.And(filters...)).
Count(&Task{})
if err != nil {
return nil, 0, 0, err