diff options
| author | Julien Phalip <jphalip@gmail.com> | 2011-10-16 06:42:50 +0000 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2011-10-16 06:42:50 +0000 |
| commit | 93a581431a493febf173a8a3f2bd27ab450f228b (patch) | |
| tree | 971d0e614ce9802887cc9680fa3db6a0b4ac4b9e /django | |
| parent | c582609c8dbaa0a782999fa5f81e71d34ff219b8 (diff) | |
Fixed #15221 -- Made the admin filters on foreign key and m2m relationships display the related field's verbose name instead of that of the related model.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/filters.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py index 261ba7a02a..ed98a9ebb5 100644 --- a/django/contrib/admin/filters.py +++ b/django/contrib/admin/filters.py @@ -146,14 +146,11 @@ class RelatedFieldListFilter(FieldListFilter): def __init__(self, field, request, params, model, model_admin, field_path): super(RelatedFieldListFilter, self).__init__( field, request, params, model, model_admin, field_path) - other_model = get_model_from_relation(field) - if isinstance(field, (models.ManyToManyField, - models.related.RelatedObject)): - # no direct field on this model, get name from other model - self.lookup_title = other_model._meta.verbose_name + if hasattr(field, 'verbose_name'): + self.lookup_title = field.verbose_name else: - self.lookup_title = field.verbose_name # use field name + self.lookup_title = other_model._meta.verbose_name rel_name = other_model._meta.pk.name self.lookup_kwarg = '%s__%s__exact' % (self.field_path, rel_name) self.lookup_kwarg_isnull = '%s__isnull' % (self.field_path) |