Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-02-24 04:00:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213 from makeplane/sync/ce-ee

Browse Source 
sync: merge conflicts need to be resolved
This commit is contained in:
sriram veeraghanta
2024-05-07 20:33:28 +05:30
committed by GitHub
parent 7c6af92684 b8f1734738
commit a2c4147952
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/plane/app/views/issue/archive.py
View File

@@ -241,9 +241,9 @@ class IssueArchiveViewSet(BaseViewSet):
)
datetime_fields = ["created_at", "updated_at"]
issues = user_timezone_converter(
issue_queryset, datetime_fields, request.user.user_timezone
issues, datetime_fields, request.user.user_timezone
)
return Response(issues, status=status.HTTP_200_OK)
def retrieve(self, request, slug, project_id, pk=None):

2
apiserver/plane/app/views/issue/draft.py
View File

@@ -232,7 +232,7 @@ class IssueDraftViewSet(BaseViewSet):
)
datetime_fields = ["created_at", "updated_at"]
issues = user_timezone_converter(
issue_queryset, datetime_fields, request.user.user_timezone
issues, datetime_fields, request.user.user_timezone
)
return Response(issues, status=status.HTTP_200_OK)