diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2013-11-21 14:11:57 +0200 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2013-11-21 14:52:00 +0200 |
| commit | 752d3d70da6291039f33781a0a2ef6f3b7c5fcb5 (patch) | |
| tree | c86d12d2ca9e1473caf84f66b9e81e0b28f9a06c /django | |
| parent | 1116a5662c1648ea3a80acc4b9a3929778bb4036 (diff) | |
Fixed #21431 -- GenRel->FK list_filter regression in admin
Report, analysis and tests from stephenmcd.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/utils.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 82f6c42721..191e18fcf8 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -389,10 +389,8 @@ class NotRelationField(Exception): def get_model_from_relation(field): - if isinstance(field, models.related.RelatedObject): - return field.model - elif getattr(field, 'rel'): # or isinstance? - return field.rel.to + if hasattr(field, 'get_path_info'): + return field.get_path_info()[-1].to_opts.model else: raise NotRelationField |