From 630e21b954a1eb86f49d3cc43899cdfceff33854 Mon Sep 17 00:00:00 2001 From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com> Date: Thu, 9 Nov 2023 18:22:38 +0530 Subject: [PATCH] fix: favourite cycle and modules displayed at top (#2719) --- apiserver/plane/api/views/cycle.py | 3 +-- apiserver/plane/api/views/module.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py index 02a583196..21defcc13 100644 --- a/apiserver/plane/api/views/cycle.py +++ b/apiserver/plane/api/views/cycle.py @@ -176,9 +176,8 @@ class CycleViewSet(BaseViewSet): def list(self, request, slug, project_id): queryset = self.get_queryset() cycle_view = request.GET.get("cycle_view", "all") - order_by = request.GET.get("order_by", "sort_order") - queryset = queryset.order_by(order_by) + queryset = queryset.order_by("-is_favorite","-created_at") # Current Cycle if cycle_view == "current": diff --git a/apiserver/plane/api/views/module.py b/apiserver/plane/api/views/module.py index 0e3454932..6c2088922 100644 --- a/apiserver/plane/api/views/module.py +++ b/apiserver/plane/api/views/module.py @@ -55,7 +55,6 @@ class ModuleViewSet(BaseViewSet): ) def get_queryset(self): - order_by = self.request.GET.get("order_by", "sort_order") subquery = ModuleFavorite.objects.filter( user=self.request.user, @@ -138,7 +137,7 @@ class ModuleViewSet(BaseViewSet): ), ) ) - .order_by(order_by, "name") + .order_by("-is_favorite","-created_at") ) def create(self, request, slug, project_id):