multitenant default filter fix (#1878)

AOT-Technologies · Feb 5, 2024 · cd3d227 · cd3d227
1 parent 8a692f3
commit cd3d227
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/forms-flow-api/src/formsflow_api/services/filter.py b/forms-flow-api/src/formsflow_api/services/filter.py
@@ -59,7 +59,13 @@ def get_user_filters(**kwargs):
         if current_app.config.get("MULTI_TENANCY_ENABLED"):
             all_filters = Filter.find_all_filters()
             all_tasks_filter = any(
-                (item.name.lower() == "all tasks" and item.status == "active")
+                (
+                    item.name.lower() == "all tasks"
+                    and item.status == "active"
+                    and item.tenant is None
+                    and (not item.roles or item.roles is None)
+                    and (not item.users or item.users is None)
+                )
                 or (item.name.lower() == "all tasks" and item.tenant == tenant_key)
                 for item in all_filters
             )