Commit e3453b61 authored by Simon Charette's avatar Simon Charette
Browse files

[1.6.x] Fixed #23329 -- Allowed inherited and m2m fields to be referenced in the admin. 

Thanks to Trac alias Markush2010 and ross for the detailed reports.

Backport of 3cbb7590 from master
parent 4db64e84

django/contrib/admin/options.py

+6 −4
Original line number Diff line number Diff line
@@ -336,11 +336,13 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)): 
            return False



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

        # references this field.

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

        registered_models = self.admin_site._registry

        for related_object in opts.get_all_related_objects():

            if (related_object.model in registered_models and

                    field in related_object.field.foreign_related_fields):

        for related_object in (opts.get_all_related_objects() +

                               opts.get_all_related_many_to_many_objects()):

            related_model = related_object.model

            if (any(issubclass(model, related_model) for model in registered_models) and

                    related_object.field.rel.get_related_field() == field):

                return True



        return False

docs/releases/1.4.15.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
===========================

Django 1.4.15 release notes

===========================



*Under development*



Django 1.4.15 fixes a regression in the 1.4.14 security release.



Bugfixes

========



* Allowed inherited and m2m fields to be referenced in the admin

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

docs/releases/1.5.10.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
===========================

Django 1.5.10 release notes

===========================



*Under development*



Django 1.5.10 fixes a regression in the 1.5.9 security release.



Bugfixes

========



* Allowed inherited and m2m fields to be referenced in the admin

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

docs/releases/1.6.7.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
==========================

Django 1.6.7 release notes

==========================



*Under development*



Django 1.6.7 fixes a regression in the 1.6.6 security release.



Bugfixes

========



* Allowed inherited and m2m fields to be referenced in the admin

  :ticket:`23329`

docs/releases/index.txt

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ versions of the documentation contain the release notes for any later releases. 
.. toctree::

   :maxdepth: 1



   1.6.7

   1.6.6

   1.6.5

   1.6.4
@@ -38,6 +39,7 @@ versions of the documentation contain the release notes for any later releases. 
.. toctree::

   :maxdepth: 1



   1.5.10

   1.5.9

   1.5.8

   1.5.7
@@ -54,6 +56,7 @@ versions of the documentation contain the release notes for any later releases. 
.. toctree::

   :maxdepth: 1



   1.4.15

   1.4.14

   1.4.13

   1.4.12