encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 14:24:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 801106f956 into b7d77d5bf2

Browse Source
This commit is contained in:
Patrick Kranzlmueller 2015-09-14 09:22:25 +00:00
commit 98cc05f1eb
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rest_framework/filters.py
View File

@ -156,26 +156,36 @@ class OrderingFilter(BaseFilterBackend):
return ordering
def remove_invalid_fields(self, queryset, fields, view):
valid_fields = getattr(view, 'ordering_fields', self.ordering_fields)
ordering_fields = getattr(view, 'ordering_fields', self.ordering_fields)
if valid_fields is None:
# Default to allowing filtering on serializer fields
serializer_class = getattr(view, 'serializer_class')
if not ordering_fields == '__all__':
serializer_class = getattr(view, 'serializer_class') or view.get_serializer_class()
if serializer_class is None:
msg = ("Cannot use %s on a view which does not have either a "
"'serializer_class' or 'ordering_fields' attribute.")
raise ImproperlyConfigured(msg % self.__class__.__name__)
if ordering_fields is None:
# Default to allowing filtering on serializer field names (return field sources)
valid_fields = [
field.source or field_name
(field.source, field_name)
for field_name, field in serializer_class().fields.items()
if not getattr(field, 'write_only', False)
]
elif valid_fields == '__all__':
return [term[0] for term in valid_fields if term[0] != "*"]
elif ordering_fields == '__all__':
# View explicitly allows filtering on any model field
valid_fields = [field.name for field in queryset.model._meta.fields]
valid_fields += queryset.query.aggregates.keys()
return [term for term in fields if term.lstrip('-') in valid_fields]
return [term for term in fields if term.lstrip('-') in valid_fields]
else:
# Allow filtering on defined field name (return field sources)
valid_fields = [
(field.source, field_name)
for field_name, field in serializer_class().fields.items()
if not getattr(field, 'write_only', False)
]
return [term[0] for term in valid_fields if term[0] != "*" and term[1].lstrip('-') in fields]
def filter_queryset(self, request, queryset, view):
ordering = self.get_ordering(request, queryset, view)