mvaldes14
/
vikunja-api
forked from vikunja/vikunja
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(saved filters): don't let query parameters override saved sorting parameters 

Resolves vikunja/frontend#3380
This commit is contained in:
kolaente 2023-04-14 11:01:31 +02:00
parent 2dad404217
commit 10f71c29b2
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/models/task_collection.go
View File

@ -150,10 +150,13 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
return nil, 0, 0, err
}
sf.Filters.SortByArr = tf.SortByArr
sf.Filters.SortBy = tf.SortBy
sf.Filters.SortByArr = append(sf.Filters.SortByArr, tf.SortByArr...)
sf.Filters.SortBy = append(sf.Filters.SortBy, tf.SortBy...)
if len(sf.Filters.OrderBy) > len(sf.Filters.SortBy) {
sf.Filters.OrderBy = sf.Filters.OrderBy[:len(sf.Filters.SortBy)]
}
sf.Filters.OrderBy = append(sf.Filters.OrderBy, tf.OrderBy...)
sf.Filters.OrderByArr = tf.OrderByArr
sf.Filters.OrderBy = tf.OrderBy
return sf.getTaskCollection().ReadAll(s, a, search, page, perPage)
}