Merge pull request #278 from datasciencebr/cuducos-fix-ordering

Keep user selected ordering in the dashboard

jarbas/core/querysets.py

@@ -49,6 +49,9 @@ def tuple_filter(self, **kwargs):
             self = self.filter(filter_)
         return self
 
+    def was_ordered(self):
+        return bool(self.query.order_by)
+
 
 def _str_to_tuple(filters):
     """

jarbas/core/tests/test_reimbursement_model.py

@@ -151,6 +151,10 @@ def test_not_in_latest_dataset(self):
         existing = Reimbursement.objects.in_latest_dataset(True)
         self.assertEqual(1, existing.count())
 
+    def test_was_ordered(self):
+        self.assertFalse(Reimbursement.objects.was_ordered())
+        self.assertTrue(Reimbursement.objects.order_by('pk').was_ordered())
+
 
 class TestCustomMethods(TestReimbursement):
 

jarbas/dashboard/admin.py

@@ -404,9 +404,10 @@ def get_search_results(self, request, queryset, search_term):
         if search_term:
             query = SearchQuery(search_term, config='portuguese')
             rank = SearchRank(F('search_vector'), query)
-            queryset = queryset.annotate(rank=rank) \
-                .filter(search_vector=query) \
-                .order_by('-rank')
+            queryset = queryset.annotate(rank=rank).filter(search_vector=query)
+
+            if not queryset.was_ordered():
+                queryset.order_by('-rank')
 
         return queryset, distinct