Skip to content

OrderingFilter adjustements #3983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2016
Merged

OrderingFilter adjustements #3983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff5f80
Made sure the OrderingFilter relies on Field.verbose_name.
charettes Mar 10, 2016
f6a475b
Marked OrderingFilter's order labels for translation.
charettes Mar 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions rest_framework/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,7 @@ def get_valid_fields(self, queryset, view):
elif valid_fields == '__all__':
# View explicitly allows filtering on any model field
valid_fields = [
(field.name, getattr(field, 'label', field.name.title()))
for field in queryset.model._meta.fields
(field.name, field.verbose_name) for field in queryset.model._meta.fields
]
valid_fields += [
(key, key.title().split('__'))
Expand Down Expand Up @@ -272,8 +271,8 @@ def get_template_context(self, request, queryset, view):
current = None if current is None else current[0]
options = []
for key, label in self.get_valid_fields(queryset, view):
options.append((key, '%s - ascending' % label))
options.append(('-' + key, '%s - descending' % label))
options.append((key, '%s - %s' % (label, _('ascending'))))
options.append(('-' + key, '%s - %s' % (label, _('descending'))))
return {
'request': request,
'current': current,
Expand Down
15 changes: 14 additions & 1 deletion tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ class SearchListView(generics.ListAPIView):


class OrderingFilterModel(models.Model):
title = models.CharField(max_length=20)
title = models.CharField(max_length=20, verbose_name='verbose title')
text = models.CharField(max_length=100)


Expand Down Expand Up @@ -741,6 +741,19 @@ class OrderingListView(generics.ListAPIView):

reload_module(filters)

def test_get_template_context(self):
class OrderingListView(generics.ListAPIView):
ordering_fields = '__all__'
serializer_class = OrderingFilterSerializer
queryset = OrderingFilterModel.objects.all()
filter_backends = (filters.OrderingFilter,)

request = factory.get('/', {'ordering': 'title'}, HTTP_ACCEPT='text/html')
view = OrderingListView.as_view()
response = view(request)

self.assertContains(response, 'verbose title')


class SensitiveOrderingFilterModel(models.Model):
username = models.CharField(max_length=20)
Expand Down