diff --git a/apps/api/plane/app/views/project/base.py b/apps/api/plane/app/views/project/base.py index e1d0c0c2a6e..5e72bb2887a 100644 --- a/apps/api/plane/app/views/project/base.py +++ b/apps/api/plane/app/views/project/base.py @@ -46,11 +46,10 @@ class ProjectViewSet(BaseViewSet): use_read_replica = True def get_queryset(self): - sort_order = ProjectMember.objects.filter( - member=self.request.user, + sort_order = ProjectUserProperty.objects.filter( + user=self.request.user, project_id=OuterRef("pk"), workspace__slug=self.kwargs.get("slug"), - is_active=True, ).values("sort_order") return self.filter_queryset( super() @@ -136,11 +135,10 @@ def list_detail(self, request, slug): @allow_permission(allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE") def list(self, request, slug): - sort_order = ProjectMember.objects.filter( - member=self.request.user, + sort_order = ProjectUserProperty.objects.filter( + user=self.request.user, project_id=OuterRef("pk"), workspace__slug=self.kwargs.get("slug"), - is_active=True, ).values("sort_order") projects = (