From 9bcb1477e246b411f7957bfb7d9361a6c01be785 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Aug 2015 14:28:28 +0100 Subject: [PATCH] Minor tweaks --- rest_framework/filters.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 0af939886..c231f574c 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -10,7 +10,7 @@ from functools import reduce from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.db import models -from django.template import Context, Template, loader +from django.template import Context, loader from django.utils import six from rest_framework.compat import ( @@ -18,12 +18,11 @@ from rest_framework.compat import ( ) from rest_framework.settings import api_settings - if 'crispy_forms' in settings.INSTALLED_APPS and crispy_forms and django_filters: # If django-crispy-forms is installed, use it to get a bootstrap3 rendering # of the DjangoFilterBackend controls when displayed as HTML. from crispy_forms.helper import FormHelper - from crispy_forms.layout import Field, Fieldset, Layout, Submit + from crispy_forms.layout import Layout, Submit class FilterSet(django_filters.FilterSet): def __init__(self, *args, **kwargs): @@ -238,7 +237,7 @@ class OrderingFilter(BaseFilterBackend): elif valid_fields == '__all__': # View explicitly allows filtering on any model field valid_fields = [ - (field.name, field.label) + (field.name, getattr(field, 'label', field.name.title())) for field in queryset.model._meta.fields ] valid_fields += [