diff --git a/apiserver/plane/api/views/cycle.py b/apiserver/plane/api/views/cycle.py index e7d247872ed..1361e86bb48 100644 --- a/apiserver/plane/api/views/cycle.py +++ b/apiserver/plane/api/views/cycle.py @@ -176,9 +176,8 @@ def get_queryset(self): 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 48f892764c5..0378e3c654d 100644 --- a/apiserver/plane/api/views/module.py +++ b/apiserver/plane/api/views/module.py @@ -55,7 +55,6 @@ def get_serializer_class(self): ) 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 @@ def get_queryset(self): ), ) ) - .order_by(order_by, "name") + .order_by("-is_favorite","-created_at") ) def create(self, request, slug, project_id):