aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-08-15 21:36:54 +0100
committerTom Christie2013-08-15 21:36:54 +0100
commit7b27997a01c22e1b91dfc2f6e7939ed1b0cb2601 (patch)
treed1efe0a40b2dd3f1699d11d3800a64a0266b2ae7
parentf34b9ff0498ca054bfe65b4da99b01d48ff052b8 (diff)
parentc245fc6cde68403e8bc06b2f9886c35dcf74789a (diff)
downloaddjango-rest-framework-7b27997a01c22e1b91dfc2f6e7939ed1b0cb2601.tar.bz2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
-rw-r--r--rest_framework/filters.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index c058bc71..4079e1bd 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -109,8 +109,7 @@ class OrderingFilter(BaseFilterBackend):
def get_ordering(self, request):
"""
- Search terms are set by a ?search=... query parameter,
- and may be comma and/or whitespace delimited.
+ Ordering is set by a comma delimited ?ordering=... query parameter.
"""
params = request.QUERY_PARAMS.get(self.ordering_param)
if params:
@@ -134,7 +133,7 @@ class OrderingFilter(BaseFilterBackend):
ordering = self.remove_invalid_fields(queryset, ordering)
if not ordering:
- # Use 'ordering' attribtue by default
+ # Use 'ordering' attribute by default
ordering = self.get_default_ordering(view)
if ordering: