From 1977268ab899daee4a6f141dd4e97c9da86e4d45 Mon Sep 17 00:00:00 2001 From: Villiers Strauss Date: Wed, 16 Nov 2016 16:59:50 +0200 Subject: [PATCH 1/2] Include filter fields' help text as coreapi descriptions --- django_filters/rest_framework/backends.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django_filters/rest_framework/backends.py b/django_filters/rest_framework/backends.py index 37c7dfa..1b1f4c6 100644 --- a/django_filters/rest_framework/backends.py +++ b/django_filters/rest_framework/backends.py @@ -98,6 +98,7 @@ class DjangoFilterBackend(BaseFilterBackend): filter_class = self.get_filter_class(view, view.get_queryset()) return [] if not filter_class else [ - compat.coreapi.Field(name=field_name, required=False, location='query') - for field_name in filter_class().filters.keys() + compat.coreapi.Field( + name=field_name, required=False, location='query', description=str(field.field.help_text)) + for field_name, field in filter_class().filters.items() ] From a0245120f04826e6f4c0deb6f26c66658daa9376 Mon Sep 17 00:00:00 2001 From: Villiers Strauss Date: Wed, 16 Nov 2016 21:12:54 +0200 Subject: [PATCH 2/2] use text_type rather than str --- django_filters/rest_framework/backends.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django_filters/rest_framework/backends.py b/django_filters/rest_framework/backends.py index 1b1f4c6..9b96b90 100644 --- a/django_filters/rest_framework/backends.py +++ b/django_filters/rest_framework/backends.py @@ -2,6 +2,7 @@ from __future__ import absolute_import from django.template import Template, TemplateDoesNotExist, loader +from django.utils import six from rest_framework.compat import template_render from rest_framework.filters import BaseFilterBackend @@ -99,6 +100,6 @@ class DjangoFilterBackend(BaseFilterBackend): return [] if not filter_class else [ compat.coreapi.Field( - name=field_name, required=False, location='query', description=str(field.field.help_text)) + name=field_name, required=False, location='query', description=six.text_type(field.field.help_text)) for field_name, field in filter_class().filters.items() ]