Skip to content

D
django-rest-framework
Commit 7b27997a by Tom Christie
Options

Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

parents f34b9ff0 c245fc6c
Showing with 2 additions and 3 deletions
rest_framework/filters.py
...@@ -109,8 +109,7 @@ class OrderingFilter(BaseFilterBackend): ...@@ -109,8 +109,7 @@ class OrderingFilter(BaseFilterBackend):
def get_ordering(self, request): def get_ordering(self, request):
""" """
Search terms are set by a ?search=... query parameter, Ordering is set by a comma delimited ?ordering=... query parameter.
and may be comma and/or whitespace delimited.
""" """
params = request.QUERY_PARAMS.get(self.ordering_param) params = request.QUERY_PARAMS.get(self.ordering_param)
if params: if params:
...@@ -134,7 +133,7 @@ class OrderingFilter(BaseFilterBackend): ...@@ -134,7 +133,7 @@ class OrderingFilter(BaseFilterBackend):
ordering = self.remove_invalid_fields(queryset, ordering) ordering = self.remove_invalid_fields(queryset, ordering)
if not ordering: if not ordering:
# Use 'ordering' attribtue by default # Use 'ordering' attribute by default
ordering = self.get_default_ordering(view) ordering = self.get_default_ordering(view)
if ordering: if ordering:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment