diff options
| author | Konrad Świat <konrad.swiat@gmail.com> | 2014-10-09 00:47:48 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-10-10 13:12:26 -0400 |
| commit | fd3dccb8dd4a7ae0ce5e5e5af25452bfca4462a7 (patch) | |
| tree | e941bc15db103745ed0279d12aa742756fdec063 /django | |
| parent | 71988ed953131908fa2a1ba9fac294cedaa6e6c9 (diff) | |
[1.7.x] Fixed #23616 - Fixed generic relations in ModelAdmin.list_filter.
Thanks ranjur for reporting bug, timgraham for review,
and collinanderson for contributing tips.
Backport of 06b11b617e from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index eac57faf44..cef9021326 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -413,7 +413,10 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)): # since it's ignored in ChangeList.get_filters(). return True model = field.rel.to - rel_name = field.rel.get_related_field().name + if hasattr(field.rel, 'get_related_field'): + rel_name = field.rel.get_related_field().name + else: + rel_name = None elif isinstance(field, RelatedObject): model = field.model rel_name = model._meta.pk.name |