REST: Integrate ordering

Order by way of the 'order' parameter on many endpoints.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/api/cover.py b/patchwork/api/cover.py
index 0b6b546cb3191e12097a897e2a50dfcb823433b3..8b8d47b1a69d28284f9e40a30a5a023ac9bc0c72 100644 (file)
--- a/patchwork/api/cover.py
+++ b/patchwork/api/cover.py
@@ -69,6 +69,7 @@ class CoverLetterList(ListAPIView):
     serializer_class = CoverLetterListSerializer
     filter_class = CoverLetterFilter
     search_fields = ('name',)
+    ordering_fields = ('id', 'name', 'date', 'submitter')
 
     def get_queryset(self):
         qs = CoverLetter.objects.all().prefetch_related('series')\

diff --git a/patchwork/api/patch.py b/patchwork/api/patch.py
index fc5a0ee1ac856b04b9ebe8d80775c66c7086b86f..e8fb0ef3cd804e038c202e66f8e24101c8aadf4b 100644 (file)
--- a/patchwork/api/patch.py
+++ b/patchwork/api/patch.py
@@ -120,6 +120,8 @@ class PatchList(ListAPIView):
     serializer_class = PatchListSerializer
     filter_class = PatchFilter
     search_fields = ('name',)
+    ordering_fields = ('id', 'name', 'project', 'date', 'state', 'archived',
+                       'submitter', 'check')
 
     def get_queryset(self):
         return Patch.objects.all().with_tag_counts()\

diff --git a/patchwork/api/person.py b/patchwork/api/person.py
index 10cf781c0980ca0979f8fc5ab1c92aac68eed066..7947f8259e90bb24ae362ba30c191c7b38aaf106 100644 (file)
--- a/patchwork/api/person.py
+++ b/patchwork/api/person.py
@@ -47,6 +47,7 @@ class PersonList(PersonMixin, ListAPIView):
     """List users."""
 
     search_fields = ('name', 'email')
+    ordering_fields = ('id', 'name', 'email')
 
 
 class PersonDetail(PersonMixin, RetrieveAPIView):

diff --git a/patchwork/api/project.py b/patchwork/api/project.py
index 8901ab48b3ca390ccd86692a1b45c2595080e919..ce3ed58191e3c4f3d9db37a96c7ba5c5d5d73418 100644 (file)
--- a/patchwork/api/project.py
+++ b/patchwork/api/project.py
@@ -76,6 +76,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')
 
 
 class ProjectDetail(ProjectMixin, RetrieveUpdateAPIView):

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

diff --git a/patchwork/api/user.py b/patchwork/api/user.py
index 2c9f71b49aa67e75439a9b463129babb24157bcb..32fe836ac826ff4f0b0b1706aed147cc50711562 100644 (file)
--- a/patchwork/api/user.py
+++ b/patchwork/api/user.py
@@ -57,6 +57,7 @@ class UserList(UserMixin, ListAPIView):
     """List users."""
 
     search_fields = ('username', 'first_name', 'last_name', 'email')
+    ordering_fields = ('id', 'username', 'email')
 
 
 class UserDetail(UserMixin, RetrieveUpdateAPIView):

diff --git a/patchwork/settings/base.py b/patchwork/settings/base.py
index 82fd9c2ad3763d22fcb661c35796022ad1a7ac3e..67373502252eb38b51ec9a96a92617a818c6e100 100644 (file)
--- a/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -147,8 +147,10 @@ REST_FRAMEWORK = {
     'DEFAULT_FILTER_BACKENDS': (
         'django_filters.rest_framework.DjangoFilterBackend',
         'rest_framework.filters.SearchFilter',
+        'rest_framework.filters.OrderingFilter',
     ),
     'SEARCH_PARAM': 'q',
+    'ORDERING_PARAM': 'order',
 }
 
 #