From be9376d9ad7ef6435867fdcbce2b1bf80973c8cf Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Thu, 19 Nov 2009 15:07:42 +0000 Subject: Corrected a regression in validation of admin fieldsets with nested definitions from r11744. Thanks to Davor Lučić for the report. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.djangoproject.com/svn/django/trunk@11752 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_validation/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests') diff --git a/tests/regressiontests/admin_validation/models.py b/tests/regressiontests/admin_validation/models.py index 1a34e4d30c..eb53a9dd6e 100644 --- a/tests/regressiontests/admin_validation/models.py +++ b/tests/regressiontests/admin_validation/models.py @@ -32,6 +32,8 @@ class Author(models.Model): class Book(models.Model): name = models.CharField(max_length=100) + subtitle = models.CharField(max_length=100) + price = models.FloatField() authors = models.ManyToManyField(Author, through='AuthorsBooks') @@ -131,6 +133,13 @@ Traceback (most recent call last): ... ImproperlyConfigured: 'FieldsetBookAdmin.fieldsets[1][1]['fields']' can't include the ManyToManyField field 'authors' because 'authors' manually specifies a 'through' model. +>>> class NestedFieldsetAdmin(admin.ModelAdmin): +... fieldsets = ( +... ('Main', {'fields': ('price', ('name', 'subtitle'))}), +... ) + +>>> validate(NestedFieldsetAdmin, Book) + # Regression test for #12209 -- If the explicitly provided through model # is specified as a string, the admin should still be able use # Model.m2m_field.through -- cgit v1.3