Allow desc options in OrderingFilter.field_labels

Ryan P Kilby · Ryan P Kilby · commit b63d222019a5 · 2016-11-04T18:52:31.000-04:00
diff --git a/django_filters/filters.py b/django_filters/filters.py
@@ -660,8 +660,8 @@ def build_choices(self, fields, labels):
             for field, param in fields.items()
         ]
         descending = [
-            ('-%s' % pair[0], self.descending_fmt % pair[1])
-            for pair in ascending
+            ('-%s' % param, labels.get('-%s' % param, self.descending_fmt % label))
+            for param, label in ascending
         ]
 
         # interleave the ascending and descending choices

Original file line number	Diff line number	Diff line change
`@@ -660,8 +660,8 @@ def build_choices(self, fields, labels):`
`660`	`660`	`for field, param in fields.items()`
`661`	`661`	`]`
`662`	`662`	`descending = [`
`663`		`- ('-%s' % pair[0], self.descending_fmt % pair[1])`
`664`		`- for pair in ascending`
	`663`	`+ ('-%s' % param, labels.get('-%s' % param, self.descending_fmt % label))`
	`664`	`+ for param, label in ascending`
`665`	`665`	`]`
`666`	`666`
`667`	`667`	`# interleave the ascending and descending choices`