fix: merge conflicts resolved

2024-03-18 19:58:39 +05:30 · 2024-03-18 19:58:39 +05:30 · 3139f8e109
commit 3139f8e109
parent 1b742f66c6 aa3702cd46
6 changed files with 63 additions and 72 deletions
--- a/apiserver/plane/app/views/project/base.py
+++ b/apiserver/plane/app/views/project/base.py
@ -72,7 +72,10 @@ class ProjectViewSet(WebhookMixin, BaseViewSet):
            .get_queryset()
            .filter(workspace__slug=self.kwargs.get("slug"))
            .filter(
-                Q(project_projectmember__member=self.request.user)
+                Q(
+                    project_projectmember__member=self.request.user,
+                    project_projectmember__is_active=True,
+                )
                | Q(network=2)
            )
            .select_related(