From 066ee7f2b3634a6ddf81177d92c1649e1883c865 Mon Sep 17 00:00:00 2001 From: sangeethailango Date: Wed, 29 Jan 2025 15:39:59 +0530 Subject: [PATCH 1/2] fix: change url --- apiserver/plane/app/urls/workspace.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apiserver/plane/app/urls/workspace.py b/apiserver/plane/app/urls/workspace.py index ea81d1ef730..f16fdb1611f 100644 --- a/apiserver/plane/app/urls/workspace.py +++ b/apiserver/plane/app/urls/workspace.py @@ -261,12 +261,12 @@ ), # User Preference path( - "workspaces//user-preferences/", + "workspaces//sidebar-preferences/", WorkspaceUserPreferenceViewSet.as_view(), name="workspace-user-preference", ), path( - "workspaces//user-preferences//", + "workspaces//sidebar-preferences//", WorkspaceUserPreferenceViewSet.as_view(), name="workspace-user-preference", ), From 3f5f8b2cfab926faf127e5d1fb6e7aa2f81d44c0 Mon Sep 17 00:00:00 2001 From: sangeethailango Date: Wed, 29 Jan 2025 16:38:18 +0530 Subject: [PATCH 2/2] Change order of user preference keys --- apiserver/plane/app/views/workspace/user_preference.py | 6 +++++- apiserver/plane/db/models/workspace.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apiserver/plane/app/views/workspace/user_preference.py b/apiserver/plane/app/views/workspace/user_preference.py index 4c245b8f8d4..66daffd1933 100644 --- a/apiserver/plane/app/views/workspace/user_preference.py +++ b/apiserver/plane/app/views/workspace/user_preference.py @@ -27,7 +27,11 @@ def get(self, request, slug): create_preference_keys = [] - keys = [key for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices] + keys = [ + key + for key, _ in WorkspaceUserPreference.UserPreferenceKeys.choices + if key not in ["projects"] + ] for preference in keys: if preference not in get_preference.values_list("key", flat=True): diff --git a/apiserver/plane/db/models/workspace.py b/apiserver/plane/db/models/workspace.py index 733cc4aa325..504873bcf55 100644 --- a/apiserver/plane/db/models/workspace.py +++ b/apiserver/plane/db/models/workspace.py @@ -392,10 +392,10 @@ class WorkspaceUserPreference(BaseModel): """Preference for the workspace for a user""" class UserPreferenceKeys(models.TextChoices): + PROJECTS = "projects", "Projects" + ANALYTICS = "analytics", "Analytics" CYCLES = "cycles", "Cycles" VIEWS = "views", "Views" - ANALYTICS = "analytics", "Analytics" - PROJECTS = "projects", "Projects" workspace = models.ForeignKey( "db.Workspace",