diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2016-09-11 08:19:56 -0700 |
|---|---|---|
| committer | Jon Dufresne <jon.dufresne@gmail.com> | 2016-09-12 19:20:35 -0700 |
| commit | e24c0a2d7cab08c2fdcd3f873a3e85f70cd718b4 (patch) | |
| tree | 3abce6f9ce57fb7f32a38b49aac1c5f75db1b383 /django | |
| parent | f0f3de3c96694fd3602541fa6074930667509ac8 (diff) | |
Fixed #26524 -- Fixed crash in admin change view when displaying many to many forward refs.
Thanks Tim Graham for the regression test.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 9b312ac30e..eb64391647 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -317,7 +317,7 @@ def _get_non_gfk_field(opts, name): raise FieldDoesNotExist() # Avoid coercing <FK>_id fields to FK - if field.is_relation and hasattr(field, 'attname') and field.attname == name: + if field.is_relation and not field.many_to_many and hasattr(field, 'attname') and field.attname == name: raise FieldIsAForeignKeyColumnName() return field |