From 2ddd7096e468d7b3ceac2fd668a1c2871f61c6f4 Mon Sep 17 00:00:00 2001 From: guru_sainath Date: Thu, 9 Jan 2025 18:20:18 +0530 Subject: [PATCH] [WEB-3087] fix: handle cycle start and end timezone conversion in list, create, and update (#6366) * chore: handled cycle start and start timezone conversion in list, create and update * chore: yarn lock --- apiserver/plane/app/serializers/cycle.py | 2 +- apiserver/plane/app/views/cycle/base.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apiserver/plane/app/serializers/cycle.py b/apiserver/plane/app/serializers/cycle.py index efc0f8f8b..b56b08350 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 ad13d5fe9..f30f49826 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",