feat(views): do not override filters in view

2024-03-14 15:44:31 +01:00 · 2024-03-14 15:44:31 +01:00 · 98b7cc9254
parent 4149ebed3a
commit 98b7cc9254
1 changed files with 5 additions and 1 deletions
--- a/pkg/models/task_collection.go
+++ b/pkg/models/task_collection.go
@ -177,7 +177,11 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
 			return nil, 0, 0, err
 		}

-		tf.Filter = view.Filter
+		if tf.Filter != "" {
+			tf.Filter = "(" + tf.Filter + ") && (" + view.Filter + ")"
+		} else {
+			tf.Filter = view.Filter
+		}
 	}

 	taskopts, err := getTaskFilterOptsFromCollection(tf)