summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2014-09-04 17:04:53 -0400
committerSimon Charette <charette.s@gmail.com>2014-09-08 14:22:29 -0400
commit065caafa70b6c422f73e364a4c241b6538969d7b (patch)
tree28e08a443f005b91ab6a5f8d9139b74b42292f7e /tests
parent78085844a7b728fab156ce85bf3463e79cf85b98 (diff)
[1.4.x] Fixed #23431 -- Allowed inline and hidden references to admin fields.
This fixes a regression introduced by the 53ff096982 security fix. Thanks to @a1tus for the report and Tim for the review. refs #23329. Backport of 342ccbd from master
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/admin_views/admin.py13
-rw-r--r--tests/regressiontests/admin_views/models.py12
-rw-r--r--tests/regressiontests/admin_views/tests.py7
3 files changed, 30 insertions, 2 deletions
diff --git a/tests/regressiontests/admin_views/admin.py b/tests/regressiontests/admin_views/admin.py
index 04410dd0bc..f1147f6c47 100644
--- a/tests/regressiontests/admin_views/admin.py
+++ b/tests/regressiontests/admin_views/admin.py
@@ -27,7 +27,8 @@ from .models import (Article, Chapter, Account, Media, Child, Parent, Picture,
Album, Question, Answer, ComplexSortedPerson, PrePopulatedPostLargeSlug,
AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod,
AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated,
- RelatedPrepopulated, ReferencedByParent, ChildOfReferer, M2MReference)
+ RelatedPrepopulated, ReferencedByParent, ChildOfReferer, M2MReference,
+ ReferencedByInline, InlineReference, InlineReferer)
def callable_year(dt_value):
@@ -570,6 +571,14 @@ class UnorderedObjectAdmin(admin.ModelAdmin):
+class InlineReferenceInline(admin.TabularInline):
+ model = InlineReference
+
+
+class InlineRefererAdmin(admin.ModelAdmin):
+ inlines = [InlineReferenceInline]
+
+
site = admin.AdminSite(name="admin")
site.register(Article, ArticleAdmin)
site.register(CustomArticle, CustomArticleAdmin)
@@ -619,6 +628,8 @@ site.register(UnorderedObject, UnorderedObjectAdmin)
site.register(ReferencedByParent)
site.register(ChildOfReferer)
site.register(M2MReference)
+site.register(ReferencedByInline)
+site.register(InlineReferer, InlineRefererAdmin)
# 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 6380abd0a9..7378dcbe96 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -625,3 +625,15 @@ class ChildOfReferer(ParentWithFK):
class M2MReference(models.Model):
ref = models.ManyToManyField('self')
+# Models for #23431
+class ReferencedByInline(models.Model):
+ pass
+
+
+class InlineReference(models.Model):
+ fk = models.ForeignKey(ReferencedByInline, related_name='hidden+')
+
+
+class InlineReferer(models.Model):
+ refs = models.ManyToManyField(InlineReference)
+
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 9c3cf234bc..eb2caf8878 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -590,11 +590,16 @@ class AdminViewBasicTest(TestCase):
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
+ # #23329 - 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)
+ # #23431 - Specifying a field that is only refered to by a inline of a registered
+ # model should be allowed.
+ response = self.client.get("/test_admin/admin/admin_views/referencedbyinline/", {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