From e24c0a2d7cab08c2fdcd3f873a3e85f70cd718b4 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 11 Sep 2016 08:19:56 -0700 Subject: Fixed #26524 -- Fixed crash in admin change view when displaying many to many forward refs. Thanks Tim Graham for the regression test. --- django/contrib/admin/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django') 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 _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 -- cgit v1.3