Skip to content
Merged
Show file tree
Hide file tree
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
13 changes: 12 additions & 1 deletion apps/api/plane/api/serializers/cycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Module imports
from .base import BaseSerializer
from plane.db.models import Cycle, CycleIssue
from plane.db.models import Cycle, CycleIssue, User
from plane.utils.timezone_converter import convert_to_utc


Expand All @@ -16,6 +16,13 @@ class CycleCreateSerializer(BaseSerializer):
and UTC normalization for time-bound iteration planning and sprint management.
"""

owned_by = serializers.PrimaryKeyRelatedField(
queryset=User.objects.all(),
required=False,
allow_null=True,
help_text="User who owns the cycle. If not provided, defaults to the current user.",
)

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
project = self.context.get("project")
Expand Down Expand Up @@ -77,6 +84,10 @@ def validate(self, data):
date=str(data.get("end_date", None).date()),
project_id=project_id,
)

if not data.get("owned_by"):
data["owned_by"] = self.context["request"].user
Comment thread
dheeru0198 marked this conversation as resolved.

return data


Expand Down
7 changes: 4 additions & 3 deletions apps/api/plane/api/views/cycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ def post(self, request, slug, project_id):
request.data.get("start_date", None) is not None
and request.data.get("end_date", None) is not None
):
serializer = CycleCreateSerializer(data=request.data)

serializer = CycleCreateSerializer(data=request.data, context={"request": request})
if serializer.is_valid():
if (
request.data.get("external_id")
Expand All @@ -340,7 +341,7 @@ def post(self, request, slug, project_id):
},
status=status.HTTP_409_CONFLICT,
)
serializer.save(project_id=project_id, owned_by=request.user)
serializer.save(project_id=project_id)
# Send the model activity
model_activity.delay(
model_name="cycle",
Expand Down Expand Up @@ -534,7 +535,7 @@ def patch(self, request, slug, project_id, pk):
status=status.HTTP_400_BAD_REQUEST,
)

serializer = CycleUpdateSerializer(cycle, data=request.data, partial=True)
serializer = CycleUpdateSerializer(cycle, data=request.data, partial=True, context={"request": request})
if serializer.is_valid():
if (
request.data.get("external_id")
Expand Down
Loading
Loading