From 208636d7c8062bf921c9701d794251b0b04a5414 Mon Sep 17 00:00:00 2001 From: sharma01ketan Date: Mon, 21 Oct 2024 12:05:52 +0530 Subject: [PATCH 1/3] fix backend --- apiserver/plane/app/views/inbox/base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py index 59a9cf955ee..dcae298d662 100644 --- a/apiserver/plane/app/views/inbox/base.py +++ b/apiserver/plane/app/views/inbox/base.py @@ -312,8 +312,8 @@ def create(self, request, slug, project_id): "issue__labels__id", distinct=True, filter=( - ~Q(labels__id__isnull=True) - & Q(labels__deleted_at__isnull=True) + ~Q(issue__labels__id__isnull=True) + & Q(issue__labels__deleted_at__isnull=True) ), ), Value([], output_field=ArrayField(UUIDField())), @@ -322,8 +322,8 @@ def create(self, request, slug, project_id): ArrayAgg( "issue__assignees__id", distinct=True, - filter=~Q(assignees__id__isnull=True) - & Q(assignees__member_project__is_active=True), + filter=~Q(issue__assignees__id__isnull=True) + & Q(issue__assignees__member_project__is_active=True), ), Value([], output_field=ArrayField(UUIDField())), ), From a24753a4a5401899c8faa71248b929a9954ddb51 Mon Sep 17 00:00:00 2001 From: sharma01ketan Date: Mon, 21 Oct 2024 15:26:50 +0530 Subject: [PATCH 2/3] fix missing arguments for allow permissions --- web/core/components/inbox/content/root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/core/components/inbox/content/root.tsx b/web/core/components/inbox/content/root.tsx index 78e682340c6..6963ffdd0cb 100644 --- a/web/core/components/inbox/content/root.tsx +++ b/web/core/components/inbox/content/root.tsx @@ -63,7 +63,7 @@ export const InboxContentRoot: FC = observer((props) => { ); const isEditable = - allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT) || + allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.PROJECT, workspaceSlug, projectId) || inboxIssue?.created_by === currentUser?.id; const isGuest = projectPermissionsByWorkspaceSlugAndProjectId(workspaceSlug, projectId) === EUserPermissions.GUEST; From 423b8b1d249ba91ed9e4d79d41a61cde7ad94bf9 Mon Sep 17 00:00:00 2001 From: sharma01ketan Date: Mon, 21 Oct 2024 15:42:08 +0530 Subject: [PATCH 3/3] Revert "fix backend" This reverts commit 208636d7c8062bf921c9701d794251b0b04a5414. --- apiserver/plane/app/views/inbox/base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apiserver/plane/app/views/inbox/base.py b/apiserver/plane/app/views/inbox/base.py index dcae298d662..59a9cf955ee 100644 --- a/apiserver/plane/app/views/inbox/base.py +++ b/apiserver/plane/app/views/inbox/base.py @@ -312,8 +312,8 @@ def create(self, request, slug, project_id): "issue__labels__id", distinct=True, filter=( - ~Q(issue__labels__id__isnull=True) - & Q(issue__labels__deleted_at__isnull=True) + ~Q(labels__id__isnull=True) + & Q(labels__deleted_at__isnull=True) ), ), Value([], output_field=ArrayField(UUIDField())), @@ -322,8 +322,8 @@ def create(self, request, slug, project_id): ArrayAgg( "issue__assignees__id", distinct=True, - filter=~Q(issue__assignees__id__isnull=True) - & Q(issue__assignees__member_project__is_active=True), + filter=~Q(assignees__id__isnull=True) + & Q(assignees__member_project__is_active=True), ), Value([], output_field=ArrayField(UUIDField())), ),