From 4685026840f0e2b895f980b6a33ad1b282aa7852 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Thu, 21 Aug 2014 11:55:23 -0400 Subject: [PATCH] [1.4.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 3cbb759 from master --- django/contrib/admin/options.py | 10 ++++++---- docs/releases/1.4.15.txt | 13 +++++++++++++ docs/releases/index.txt | 1 + tests/regressiontests/admin_views/admin.py | 5 ++++- tests/regressiontests/admin_views/models.py | 18 ++++++++++++++++++ tests/regressiontests/admin_views/tests.py | 9 +++++++++ 6 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 docs/releases/1.4.15.txt diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index cf3497b93c..fa7a6f0b9c 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -278,11 +278,13 @@ class BaseModelAdmin(object): 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 == related_object.field.rel.get_related_field()): + 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 diff --git a/docs/releases/1.4.15.txt b/docs/releases/1.4.15.txt new file mode 100644 index 0000000000..e9498e8a84 --- /dev/null +++ b/docs/releases/1.4.15.txt @@ -0,0 +1,13 @@ +=========================== +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 `_) diff --git a/docs/releases/index.txt b/docs/releases/index.txt index 246c688b0b..1b1a5fe955 100644 --- a/docs/releases/index.txt +++ b/docs/releases/index.txt @@ -19,6 +19,7 @@ Final releases .. toctree:: :maxdepth: 1 + 1.4.15 1.4.14 1.4.13 1.4.12 diff --git a/tests/regressiontests/admin_views/admin.py b/tests/regressiontests/admin_views/admin.py index 3369c557b7..04410dd0bc 100644 --- a/tests/regressiontests/admin_views/admin.py +++ b/tests/regressiontests/admin_views/admin.py @@ -27,7 +27,7 @@ from .models import (Article, Chapter, Account, Media, Child, Parent, Picture, Album, Question, Answer, ComplexSortedPerson, PrePopulatedPostLargeSlug, AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod, AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated, - RelatedPrepopulated) + RelatedPrepopulated, ReferencedByParent, ChildOfReferer, M2MReference) def callable_year(dt_value): @@ -616,6 +616,9 @@ site.register(OtherStory, OtherStoryAdmin) site.register(Report, ReportAdmin) site.register(MainPrepopulated, MainPrepopulatedAdmin) site.register(UnorderedObject, UnorderedObjectAdmin) +site.register(ReferencedByParent) +site.register(ChildOfReferer) +site.register(M2MReference) # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2. # That way we cover all four cases: diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py index e158e07603..6380abd0a9 100644 --- a/tests/regressiontests/admin_views/models.py +++ b/tests/regressiontests/admin_views/models.py @@ -607,3 +607,21 @@ class UnorderedObject(models.Model): """ name = models.CharField(max_length=255) bool = models.BooleanField(default=True) + + +# Models for #23329 +class ReferencedByParent(models.Model): + pass + + +class ParentWithFK(models.Model): + fk = models.ForeignKey(ReferencedByParent) + + +class ChildOfReferer(ParentWithFK): + pass + + +class M2MReference(models.Model): + ref = models.ManyToManyField('self') + diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index c40f009177..9c3cf234bc 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -586,6 +586,15 @@ class AdminViewBasicTest(TestCase): response = self.client.get("/test_admin/admin/admin_views/section/", {TO_FIELD_VAR: 'id'}) self.assertEqual(response.status_code, 200) + # Specifying a field referenced by another model though a m2m should be allowed. + response = self.client.get("/test_admin/admin/admin_views/m2mreference/", {TO_FIELD_VAR: 'id'}) + self.assertEqual(response.status_code, 200) + + # Specifying a field that is not refered by any other model directly registered + # to this admin site but registered through inheritance should be allowed. + response = self.client.get("/test_admin/admin/admin_views/referencedbyparent/", {TO_FIELD_VAR: 'id'}) + self.assertEqual(response.status_code, 200) + def test_allowed_filtering_15103(self): """ Regressions test for ticket 15103 - filtering on fields defined in a