OrderingFilter adjustements (#3983)

charettes · tomchristie · commit d87f2bc7b67c · 2016-04-08T15:37:23.000+01:00
* Made sure the OrderingFilter relies on Field.verbose_name.

* Marked OrderingFilter's order labels for translation.
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -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('__'))
@@ -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,
diff --git a/tests/test_filters.py b/tests/test_filters.py
@@ -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)
 
 
@@ -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)
