Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions apiserver/plane/api/views/cycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,13 +333,21 @@ def partial_update(self, request, slug, project_id, pk):
workspace__slug=slug, project_id=project_id, pk=pk
)

request_data = request.data

if cycle.end_date is not None and cycle.end_date < timezone.now().date():
return Response(
{
"error": "The Cycle has already been completed so it cannot be edited"
},
status=status.HTTP_400_BAD_REQUEST,
)
if "sort_order" in request_data:
# Can only change sort order
request_data = {
"sort_order": request_data.get("sort_order", cycle.sort_order)
}
else:
return Response(
{
"error": "The Cycle has already been completed so it cannot be edited"
},
status=status.HTTP_400_BAD_REQUEST,
)

serializer = CycleWriteSerializer(cycle, data=request.data, partial=True)
if serializer.is_valid():
Expand Down Expand Up @@ -373,7 +381,9 @@ def retrieve(self, request, slug, project_id, pk):
.annotate(assignee_id=F("assignees__id"))
.annotate(avatar=F("assignees__avatar"))
.annotate(display_name=F("assignees__display_name"))
.values("first_name", "last_name", "assignee_id", "avatar", "display_name")
.values(
"first_name", "last_name", "assignee_id", "avatar", "display_name"
)
.annotate(total_issues=Count("assignee_id"))
.annotate(
completed_issues=Count(
Expand Down Expand Up @@ -709,7 +719,6 @@ def post(self, request, slug, project_id):


class CycleFavoriteViewSet(BaseViewSet):

serializer_class = CycleFavoriteSerializer
model = CycleFavorite

Expand Down