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.

chore: draft issue listing (#5874)

Bavisetti Narayan3c3fc7cd6ddc
diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py
index 5fa959b267..882692dac0 100644
--- a/apiserver/plane/api/views/cycle.py
+++ b/apiserver/plane/api/views/cycle.py
@@ -404,11 +404,7 @@ class CycleAPIEndpoint(BaseAPIView):
epoch=int(timezone.now().timestamp()),
)
# Delete the cycle
- cycle.delete()
- # Delete the cycle issues
- CycleIssue.objects.filter(
- cycle_id=self.kwargs.get("pk"),
- ).delete()
+ cycle.delete(soft=False)
# Delete the user favorite cycle
UserFavorite.objects.filter(
entity_type="cycle",
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py
index e3620762fd..e021c4ba1a 100644
--- a/apiserver/plane/app/views/cycle/base.py
+++ b/apiserver/plane/app/views/cycle/base.py
@@ -490,12 +490,9 @@ class CycleViewSet(BaseViewSet):
notification=True,
origin=request.META.get("HTTP_ORIGIN"),
)
- # Delete the cycle
- cycle.delete()
- # Delete the cycle issues
- CycleIssue.objects.filter(
- cycle_id=self.kwargs.get("pk"),
- ).delete()
+ # TODO: Soft delete the cycle break the onetoone relationship with cycle issue
+ cycle.delete(soft=False)
+
# Delete the user favorite cycle
UserFavorite.objects.filter(
user=request.user,
diff --git a/apiserver/plane/app/views/workspace/draft.py b/apiserver/plane/app/views/workspace/draft.py
index d116c42147..ae7db2a401 100644
--- a/apiserver/plane/app/views/workspace/draft.py
+++ b/apiserver/plane/app/views/workspace/draft.py
@@ -60,8 +60,8 @@ class WorkspaceDraftIssueViewSet(BaseViewSet):
.annotate(
cycle_id=Case(
When(
- issue_cycle__cycle__deleted_at__isnull=True,
- then=F("issue_cycle__cycle_id"),
+ draft_issue_cycle__cycle__deleted_at__isnull=True,
+ then=F("draft_issue_cycle__cycle_id"),
),
default=None,
)