From 1d60d1425af60e60ec18ac6496dee498e0758b35 Mon Sep 17 00:00:00 2001 From: sangeethailango Date: Mon, 6 Jan 2025 13:04:16 +0530 Subject: [PATCH] Enable sort order to be updatable --- apiserver/plane/app/urls/workspace.py | 2 +- .../plane/app/views/workspace/preference.py | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apiserver/plane/app/urls/workspace.py b/apiserver/plane/app/urls/workspace.py index b5eb3ff1e05..2bb3d5b1d12 100644 --- a/apiserver/plane/app/urls/workspace.py +++ b/apiserver/plane/app/urls/workspace.py @@ -236,7 +236,7 @@ name="workspace-home-preference", ), path( - "workspaces//home-preferences//", + "workspaces//home-preferences//", WorkspacePreferenceViewSet.as_view(), name="workspace-home-preference", ), diff --git a/apiserver/plane/app/views/workspace/preference.py b/apiserver/plane/app/views/workspace/preference.py index 1980bd9e892..92c72c89398 100644 --- a/apiserver/plane/app/views/workspace/preference.py +++ b/apiserver/plane/app/views/workspace/preference.py @@ -49,16 +49,24 @@ def get(self, request, slug): return Response(workspace_user_home_preferences, status=status.HTTP_200_OK) @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE") - def patch(self, request, slug, pk): - preference = WorkspaceHomePreference.objects.filter(pk=pk, workspace__slug=slug) + def patch(self, request, slug, key): + preference = WorkspaceHomePreference.objects.filter( + key=key, workspace__slug=slug + ) if preference: - WorkspaceHomePreference.objects.update( - is_enabled=request.data["is_enabled"] - ) + if "is_enabled" in request.data: + WorkspaceHomePreference.objects.update( + is_enabled=request.data["is_enabled"] + ) + + if "sort_order" in request.data: + WorkspaceHomePreference.objects.update( + sort_order=request.data["sort_order"] + ) preference = WorkspaceHomePreference.objects.filter( - pk=pk, user=request.user + key=key, user=request.user ).values("key", "is_enabled", "sort_order", "config", "id") return Response(preference, status=status.HTTP_200_OK)