Fix loading task
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
kolaente 2020-12-23 15:31:07 +01:00
parent 4ef0579a20
commit 524870f4b1
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 7 additions and 8 deletions

View File

@ -399,32 +399,31 @@ func getRawTasksForLists(s *xorm.Session, lists []*List, a web.Auth, opts *taskO
filters = append(filters, cond)
}
query := s.Where(builder.And(listCond, where))
queryCount := s.Where(builder.And(listCond, where))
var filterCond builder.Cond
if len(filters) > 0 {
if opts.filterConcat == filterConcatOr {
query = query.Where(builder.Or(filters...))
queryCount = queryCount.Where(builder.Or(filters...))
filterCond = builder.Or(filters...)
}
if opts.filterConcat == filterConcatAnd {
query = query.Where(builder.And(filters...))
queryCount = queryCount.Where(builder.And(filters...))
filterCond = builder.And(filters...)
}
}
limit, start := getLimitFromPageIndex(opts.page, opts.perPage)
cond := builder.And(listCond, where, filterCond)
query := s.Where(cond)
if limit > 0 {
query = query.Limit(limit, start)
}
tasks = []*Task{}
err = query.Find(&tasks)
err = query.OrderBy(orderby).Find(&tasks)
if err != nil {
return nil, 0, 0, err
}
queryCount := s.Where(cond)
totalItems, err = queryCount.
Count(&Task{})
if err != nil {