From bb72aca5d4783a87bd425cae20da38b6b3405639 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Tue, 9 Mar 2010 00:38:53 +0000 Subject: Fixed #12689: Fixed admin validation to report an error on invalid exclude specification. Thanks for report to bparker and for patch with tests to ramiro. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12734 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_validation/models.py | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'tests') diff --git a/tests/regressiontests/admin_validation/models.py b/tests/regressiontests/admin_validation/models.py index b50764844e..d927574538 100644 --- a/tests/regressiontests/admin_validation/models.py +++ b/tests/regressiontests/admin_validation/models.py @@ -72,6 +72,37 @@ Traceback (most recent call last): ... ImproperlyConfigured: 'InvalidFields.fields' refers to field 'spam' that is missing from the form. +# Tests for basic validation of 'exclude' option values (#12689) + +>>> class ExcludedFields1(admin.ModelAdmin): +... exclude = ('foo') + +>>> validate(ExcludedFields1, Book) +Traceback (most recent call last): + ... +ImproperlyConfigured: 'ExcludedFields1.exclude' must be a list or tuple. + +>>> class ExcludedFields2(admin.ModelAdmin): +... exclude = ('name', 'name') + +>>> validate(ExcludedFields2, Book) +Traceback (most recent call last): + ... +ImproperlyConfigured: There are duplicate field(s) in ExcludedFields2.exclude + +>>> class ExcludedFieldsInline(admin.TabularInline): +... model = Song +... exclude = ('foo') + +>>> class ExcludedFieldsAlbumAdmin(admin.ModelAdmin): +... model = Album +... inlines = [ExcludedFieldsInline] + +>>> validate(ExcludedFieldsAlbumAdmin, Album) +Traceback (most recent call last): + ... +ImproperlyConfigured: 'ExcludedFieldsInline.exclude' must be a list or tuple. + # Regression test for #9932 - exclude in InlineModelAdmin # should not contain the ForeignKey field used in ModelAdmin.model -- cgit v1.3