Apply model ordering by default

gundotio · Dec 8, 2021 · 49a5a55 · 49a5a55
1 parent 50390c3
commit 49a5a55
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/worf/views/list.py b/worf/views/list.py
@@ -151,7 +151,6 @@ def get_processed_queryset(self):
             queryset = (
                 apply_filterset(self.filter_set, queryset, filterset_kwargs)
                 .filter(self.search_query)
-                .order_by(*order_by)
                 .distinct()
             )
 
@@ -162,6 +161,9 @@ def get_processed_queryset(self):
                         if key.endswith("!")
                         else queryset.filter(**{key: item})
                     )
+
+            if order_by:
+                queryset = queryset.order_by(*order_by)
         except TypeError as e:
             if settings.DEBUG:
                 raise HTTP420(f"Error, {self.lookup_kwargs}, {e.__cause__}")