Commit a24cf217 authored by Emmanuelle Delescolle's avatar Emmanuelle Delescolle Committed by Tim Graham
Browse files

Fixed #23604 -- Allowed related m2m fields to be references in the admin. 

Thanks Simon Charette for review.
parent e501d4c5

django/contrib/admin/options.py

+5 −0
Original line number Diff line number Diff line
@@ -451,6 +451,11 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)): 
        except FieldDoesNotExist:

            return False



        # Check whether this model is the origin of a M2M relationship

        # in which case to_field has to be the pk on this model.

        if opts.many_to_many and field.primary_key:

            return True



        # Make sure at least one of the models registered for this site

        # references this field through a FK or a M2M relationship.

        registered_models = set()

docs/releases/1.4.16.txt

+5 −2
Original line number Diff line number Diff line
@@ -4,12 +4,15 @@ Django 1.4.16 release notes 


*Under development*



Django 1.4.16 fixes a regression in the 1.4.14 security release and a bug

preventing the use of some GEOS versions with GeoDjango.

Django 1.4.16 fixes a couple regressions in the 1.4.14 security release and a

bug preventing the use of some GEOS versions with GeoDjango.



Bugfixes

========



* Allowed related many-to-many fields to be referenced in the admin

  (`#23604 <http://code.djangoproject.com/ticket/23604>`_).



* Allowed inline and hidden references to admin fields

  (`#23431 <http://code.djangoproject.com/ticket/23431>`_).

docs/releases/1.5.11.txt

+4 −1
Original line number Diff line number Diff line
@@ -4,10 +4,13 @@ Django 1.5.11 release notes 


*Under development*



Django 1.5.11 fixes a regression in the 1.5.9 security release.

Django 1.5.11 fixes a couple regressions in the 1.5.9 security release.



Bugfixes

========



* Allowed related many-to-many fields to be referenced in the admin

  (`#23604 <http://code.djangoproject.com/ticket/23604>`_).



* Allowed inline and hidden references to admin fields

  (`#23431 <http://code.djangoproject.com/ticket/23431>`_).

docs/releases/1.6.8.txt

+4 −1
Original line number Diff line number Diff line
@@ -4,9 +4,12 @@ Django 1.6.8 release notes 


*Under development*



Django 1.6.8 fixes a regression in the 1.6.6 security release.

Django 1.6.8 fixes a couple regressions in the 1.6.6 security release.



Bugfixes

========



* Allowed related many-to-many fields to be referenced in the admin

  (:ticket:`23604`).



* Allowed inline and hidden references to admin fields (:ticket:`23431`).

docs/releases/1.7.1.txt

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ Django 1.7.1 fixes several bugs in 1.7. 
Bugfixes

========



* Allowed related many-to-many fields to be referenced in the admin

  (:ticket:`23604`).



* Added a more helpful error message if you try to migrate an app without first

  creating the ``contenttypes`` table (:ticket:`22411`).