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.

[WEB-3087] fix: handle cycle start and end timezone conversion in list, create, and update (#6366)

guru_sainath2ddd7096e468
diff --git a/apiserver/plane/app/serializers/cycle.py b/apiserver/plane/app/serializers/cycle.py
index efc0f8f8b2..b56b083505 100644
--- a/apiserver/plane/app/serializers/cycle.py
+++ b/apiserver/plane/app/serializers/cycle.py
@@ -22,7 +22,7 @@ class CycleWriteSerializer(BaseSerializer):
):
project_id = (
self.initial_data.get("project_id", None)
- or (self.instance and self.instance.get("project_id", None))
+ or (self.instance and self.instance.project_id)
or self.context.get("project_id", None)
)
is_start_date_end_date_equal = (
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.py
index ad13d5fe9b..f30f498265 100644
--- a/apiserver/plane/app/views/cycle/base.py
+++ b/apiserver/plane/app/views/cycle/base.py
@@ -303,6 +303,11 @@ class CycleViewSet(BaseViewSet):
.first()
)
+ datetime_fields = ["start_date", "end_date"]
+ cycle = user_timezone_converter(
+ cycle, datetime_fields, request.user.user_timezone
+ )
+
# Send the model activity
model_activity.delay(
model_name="cycle",
@@ -387,6 +392,11 @@ class CycleViewSet(BaseViewSet):
"created_by",
).first()
+ datetime_fields = ["start_date", "end_date"]
+ cycle = user_timezone_converter(
+ cycle, datetime_fields, request.user.user_timezone
+ )
+
# Send the model activity
model_activity.delay(
model_name="cycle",