diff options
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 |