REST: Specify default ordering fields

This hides warnings likes the following:

    UnorderedObjectListWarning: Pagination may yield inconsistent
    results with an unordered object_list: <QuerySet [<User:
    test_user_0>]>

Signed-off-by: Stephen Finucane <stephen@that.guru>
[dja: fix merge conflict in patch.py]
Signed-off-by: Daniel Axtens <dja@axtens.net>
Acked-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/api/bundle.py b/patchwork/api/bundle.py
index 92899566365e0ef40123a964ac77cec297282bd4..0278592a9e34c26dd1b615bc74875cc1331c4b9e 100644 (file)
--- a/patchwork/api/bundle.py
+++ b/patchwork/api/bundle.py
@@ -76,6 +76,7 @@ class BundleList(BundleMixin, ListAPIView):
     filter_class = BundleFilter
     search_fields = ('name',)
     ordering_fields = ('id', 'name', 'owner')
+    ordering = 'id'
 
 
 class BundleDetail(BundleMixin, RetrieveAPIView):

diff --git a/patchwork/api/check.py b/patchwork/api/check.py
index 66b460174e87270f3af59c295891a80062f132ca..5b3815050664f516fad538c2cd7c1797eb705b13 100644 (file)
--- a/patchwork/api/check.py
+++ b/patchwork/api/check.py
@@ -81,6 +81,7 @@ class CheckListCreate(CheckMixin, ListCreateAPIView):
     """List or create checks."""
 
     lookup_url_kwarg = 'patch_id'
+    ordering = 'id'
 
     def create(self, request, patch_id, *args, **kwargs):
         p = Patch.objects.get(id=patch_id)

diff --git a/patchwork/api/cover.py b/patchwork/api/cover.py
index 5d829eba2f07b02d4e4192bd59fe289af83befa9..2a7651f488aef75f2b4f3519485ff21ae393a174 100644 (file)
--- a/patchwork/api/cover.py
+++ b/patchwork/api/cover.py
@@ -75,6 +75,7 @@ class CoverLetterList(ListAPIView):
     filter_class = CoverLetterFilter
     search_fields = ('name',)
     ordering_fields = ('id', 'name', 'date', 'submitter')
+    ordering = 'id'
 
     def get_queryset(self):
         qs = CoverLetter.objects.all().prefetch_related('series')\

diff --git a/patchwork/api/event.py b/patchwork/api/event.py
index cc9270ae2ac94b2f8b8c355361cd74ed24ae57dc..0d97af227f0e6f1c245b9d36a8ad73b8a93f6ef1 100644 (file)
--- a/patchwork/api/event.py
+++ b/patchwork/api/event.py
@@ -91,13 +91,12 @@ class EventList(ListAPIView):
     serializer_class = EventSerializer
     filter_class = EventFilter
     page_size_query_param = None  # fixed page size
-    ordering = '-date'
     ordering_fields = ()
+    ordering = '-date'
 
     def get_queryset(self):
         return Event.objects.all()\
             .select_related('project', 'patch', 'series', 'cover',
                             'previous_state', 'current_state',
                             'previous_delegate', 'current_delegate',
-                            'created_check')\
-            .order_by('-date')
+                            'created_check')

diff --git a/patchwork/api/patch.py b/patchwork/api/patch.py
index 1f0ead1f799a762b43654348ec7e6dc067bc123c..cb829c7db5d74228d41da8dadc7f579f8aa2fe15 100644 (file)
--- a/patchwork/api/patch.py
+++ b/patchwork/api/patch.py
@@ -148,6 +148,7 @@ class PatchList(ListAPIView):
     search_fields = ('name',)
     ordering_fields = ('id', 'name', 'project', 'date', 'state', 'archived',
                        'submitter', 'check')
+    ordering = 'id'
 
     def get_queryset(self):
         # TODO(stephenfin): Does the defer here cause issues with Django 1.6

diff --git a/patchwork/api/person.py b/patchwork/api/person.py
index d002afff5d9f9b9b82bbea1064a927e492324935..326c117e2cf84fa32f18d567b2f04932820b8348 100644 (file)
--- a/patchwork/api/person.py
+++ b/patchwork/api/person.py
@@ -53,6 +53,7 @@ class PersonList(PersonMixin, ListAPIView):
 
     search_fields = ('name', 'email')
     ordering_fields = ('id', 'name', 'email')
+    ordering = 'id'
 
 
 class PersonDetail(PersonMixin, RetrieveAPIView):

diff --git a/patchwork/api/project.py b/patchwork/api/project.py
index 11d65049140dd2326c1d54ab8dffe23e1caa22fe..446c47356951392301482717209970e2a90055e6 100644 (file)
--- a/patchwork/api/project.py
+++ b/patchwork/api/project.py
@@ -79,6 +79,7 @@ class ProjectList(ProjectMixin, ListAPIView):
     search_fields = ('link_name', 'list_id', 'list_email', 'web_url',
                      'scm_url', 'webscm_url')
     ordering_fields = ('id', 'name', 'link_name', 'list_id')
+    ordering = 'id'
 
 
 class ProjectDetail(ProjectMixin, RetrieveUpdateAPIView):

diff --git a/patchwork/api/series.py b/patchwork/api/series.py
index 12f9277c882cb69acf16adc109f48bbfc8206c1a..b5f4450a71b00cf4c914b795162247ff273fc368 100644 (file)
--- a/patchwork/api/series.py
+++ b/patchwork/api/series.py
@@ -71,6 +71,7 @@ class SeriesList(SeriesMixin, ListAPIView):
     filter_class = SeriesFilter
     search_fields = ('name',)
     ordering_fields = ('id', 'name', 'date', 'submitter', 'received_all')
+    ordering = 'id'
 
 
 class SeriesDetail(SeriesMixin, RetrieveAPIView):

diff --git a/patchwork/api/user.py b/patchwork/api/user.py
index 32fe836ac826ff4f0b0b1706aed147cc50711562..1bfad43d6a9c6891dc295117bd1933288453de0e 100644 (file)
--- a/patchwork/api/user.py
+++ b/patchwork/api/user.py
@@ -58,6 +58,7 @@ class UserList(UserMixin, ListAPIView):
 
     search_fields = ('username', 'first_name', 'last_name', 'email')
     ordering_fields = ('id', 'username', 'email')
+    ordering = 'id'
 
 
 class UserDetail(UserMixin, RetrieveUpdateAPIView):