Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

dev: assignee leave changes (#4009)

Bavisetti Narayan4d1b5adfc4c6
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py
index f2b4935023..778072d9ff 100644
--- a/apiserver/plane/app/views/cycle/base.py
+++ b/apiserver/plane/app/views/cycle/base.py
@@ -180,6 +180,9 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
distinct=True,
filter=~Q(
issue_cycle__issue__assignees__id__isnull=True
+ )
+ & Q(
+ issue_cycle__issue__assignees__member_project__is_active=True
),
),
Value([], output_field=ArrayField(UUIDField())),
@@ -816,6 +819,9 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
distinct=True,
filter=~Q(
issue_cycle__issue__assignees__id__isnull=True
+ )
+ & Q(
+ issue_cycle__issue__assignees__member_project__is_active=True
),
),
Value([], output_field=ArrayField(UUIDField())),
diff --git a/apiserver/plane/app/views/cycle/issue.py b/apiserver/plane/app/views/cycle/issue.py
index d2a7795dab..2a5505dd05 100644
--- a/apiserver/plane/app/views/cycle/issue.py
+++ b/apiserver/plane/app/views/cycle/issue.py
@@ -143,7 +143,8 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/dashboard/base.py b/apiserver/plane/app/views/dashboard/base.py
index 508f81f21d..33b3cf9d5b 100644
--- a/apiserver/plane/app/views/dashboard/base.py
+++ b/apiserver/plane/app/views/dashboard/base.py
@@ -149,7 +149,8 @@ def dashboard_assigned_issues(self, request, slug):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -303,7 +304,8 @@ def dashboard_created_issues(self, request, slug):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py
index fb3b9227f2..710aa10a22 100644
--- a/apiserver/plane/app/views/inbox/base.py
+++ b/apiserver/plane/app/views/inbox/base.py
@@ -146,7 +146,8 @@ class InboxIssueViewSet(BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/archive.py b/apiserver/plane/app/views/issue/archive.py
index 540715a241..d9274ae4fa 100644
--- a/apiserver/plane/app/views/issue/archive.py
+++ b/apiserver/plane/app/views/issue/archive.py
@@ -105,7 +105,8 @@ class IssueArchiveViewSet(BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/base.py b/apiserver/plane/app/views/issue/base.py
index f1b4c76278..a27f52c748 100644
--- a/apiserver/plane/app/views/issue/base.py
+++ b/apiserver/plane/app/views/issue/base.py
@@ -52,6 +52,7 @@ from plane.db.models import (
from plane.bgtasks.issue_activites_task import issue_activity
from plane.utils.issue_filters import issue_filters
+
class IssueListEndpoint(BaseAPIView):
permission_classes = [
@@ -114,7 +115,8 @@ class IssueListEndpoint(BaseAPIView):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
@@ -308,7 +310,8 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/draft.py b/apiserver/plane/app/views/issue/draft.py
index db6b5b9fb9..e1c6962d89 100644
--- a/apiserver/plane/app/views/issue/draft.py
+++ b/apiserver/plane/app/views/issue/draft.py
@@ -101,7 +101,8 @@ class IssueDraftViewSet(BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/issue/sub_issue.py b/apiserver/plane/app/views/issue/sub_issue.py
index 6ec4a2de1f..da479e0e99 100644
--- a/apiserver/plane/app/views/issue/sub_issue.py
+++ b/apiserver/plane/app/views/issue/sub_issue.py
@@ -83,7 +83,8 @@ class SubIssuesEndpoint(BaseAPIView):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/module/issue.py b/apiserver/plane/app/views/module/issue.py
index cfa8ee478c..d264333407 100644
--- a/apiserver/plane/app/views/module/issue.py
+++ b/apiserver/plane/app/views/module/issue.py
@@ -93,7 +93,8 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/view/base.py b/apiserver/plane/app/views/view/base.py
index e2fc29aac1..45e7bd29cf 100644
--- a/apiserver/plane/app/views/view/base.py
+++ b/apiserver/plane/app/views/view/base.py
@@ -125,7 +125,8 @@ class GlobalViewIssuesViewSet(BaseViewSet):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),
diff --git a/apiserver/plane/app/views/workspace/user.py b/apiserver/plane/app/views/workspace/user.py
index fe495de6c5..94a22a1a7f 100644
--- a/apiserver/plane/app/views/workspace/user.py
+++ b/apiserver/plane/app/views/workspace/user.py
@@ -165,7 +165,8 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
ArrayAgg(
"assignees__id",
distinct=True,
- filter=~Q(assignees__id__isnull=True),
+ filter=~Q(assignees__id__isnull=True)
+ & Q(assignees__member_project__is_active=True),
),
Value([], output_field=ArrayField(UUIDField())),
),