From ef4cb453fb032b93f4241e059518a710e47b98aa Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Mon, 22 Jul 2024 15:24:45 +0530 Subject: [PATCH 1/2] chore: display cross project issue relations --- apiserver/plane/app/views/issue/relation.py | 23 +-------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/apiserver/plane/app/views/issue/relation.py b/apiserver/plane/app/views/issue/relation.py index 1068da1e046..fe93cb62e8d 100644 --- a/apiserver/plane/app/views/issue/relation.py +++ b/apiserver/plane/app/views/issue/relation.py @@ -37,24 +37,6 @@ class IssueRelationViewSet(BaseViewSet): ProjectEntityPermission, ] - def get_queryset(self): - return self.filter_queryset( - super() - .get_queryset() - .filter(workspace__slug=self.kwargs.get("slug")) - .filter(project_id=self.kwargs.get("project_id")) - .filter(issue_id=self.kwargs.get("issue_id")) - .filter( - project__project_projectmember__member=self.request.user, - project__project_projectmember__is_active=True, - project__archived_at__isnull=True, - ) - .select_related("project") - .select_related("workspace") - .select_related("issue") - .distinct() - ) - def list(self, request, slug, project_id, issue_id): issue_relations = ( IssueRelation.objects.filter( @@ -98,10 +80,7 @@ def list(self, request, slug, project_id, issue_id): ).values_list("issue_id", flat=True) queryset = ( - Issue.issue_objects.filter( - workspace__slug=slug, - project_id=project_id, - ) + Issue.issue_objects .filter(workspace__slug=self.kwargs.get("slug")) .select_related("workspace", "project", "state", "parent") .prefetch_related("assignees", "labels", "issue_module__module") From ae68955acb0310281c26d7dfd8079f2065ae12c3 Mon Sep 17 00:00:00 2001 From: NarayanBavisetti Date: Mon, 22 Jul 2024 16:45:40 +0530 Subject: [PATCH 2/2] chore: removed the slug --- apiserver/plane/app/views/issue/relation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/plane/app/views/issue/relation.py b/apiserver/plane/app/views/issue/relation.py index fe93cb62e8d..ab32d47e77f 100644 --- a/apiserver/plane/app/views/issue/relation.py +++ b/apiserver/plane/app/views/issue/relation.py @@ -81,7 +81,7 @@ def list(self, request, slug, project_id, issue_id): queryset = ( Issue.issue_objects - .filter(workspace__slug=self.kwargs.get("slug")) + .filter(workspace__slug=slug) .select_related("workspace", "project", "state", "parent") .prefetch_related("assignees", "labels", "issue_module__module") .annotate(cycle_id=F("issue_cycle__cycle_id"))