ami/tl-vikunja
1
0
Fork 0
Code

feat(views): do not override filters in view

Browse Source
This commit is contained in:
kolaente 2024-03-14 15:44:31 +01:00
parent 4149ebed3a
commit 98b7cc9254
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/task_collection.go
View File

@ -177,8 +177,12 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
return nil, 0, 0, err return nil, 0, 0, err
} }
if tf.Filter != "" {
tf.Filter = "(" + tf.Filter + ") && (" + view.Filter + ")"
} else {
tf.Filter = view.Filter tf.Filter = view.Filter
} }
}
taskopts, err := getTaskFilterOptsFromCollection(tf) taskopts, err := getTaskFilterOptsFromCollection(tf)
if err != nil { if err != nil {