Author: jacob
Date: 2008-08-28 10:43:04 -0500 (Thu, 28 Aug 2008)
New Revision: 8662
Added:
django/trunk/tests/regressiontests/admin_validation/
django/trunk/tests/regressiontests/admin_validation/__init__.py
django/trunk/tests/regressiontests/admin_validation/models.py
Modified:
django/trunk/django/contrib/admin/validation.py
Log:
Fixed #8027: correctly validate fields/fieldsets in `ModelAdmin` validation
when using custom `ModelForm`s.
Modified: django/trunk/django/contrib/admin/validation.py
===================================================================
--- django/trunk/django/contrib/admin/validation.py 2008-08-28 15:06:18 UTC
(rev 8661)
+++ django/trunk/django/contrib/admin/validation.py 2008-08-28 15:43:04 UTC
(rev 8662)
@@ -251,7 +251,7 @@
% (cls.__name__, label, field, model.__name__))
def check_formfield(cls, model, opts, label, field):
- if hasattr(cls.form, 'base_fields'):
+ if getattr(cls.form, 'base_fields', None):
try:
cls.form.base_fields[field]
except KeyError:
Added: django/trunk/tests/regressiontests/admin_validation/__init__.py
===================================================================
Added: django/trunk/tests/regressiontests/admin_validation/models.py
===================================================================
--- django/trunk/tests/regressiontests/admin_validation/models.py
(rev 0)
+++ django/trunk/tests/regressiontests/admin_validation/models.py
2008-08-28 15:43:04 UTC (rev 8662)
@@ -0,0 +1,43 @@
+"""
+Tests of ModelAdmin validation logic.
+"""
+
+from django.db import models
+
+class Song(models.Model):
+ title = models.CharField(max_length=150)
+
+ class Meta:
+ ordering = ('title',)
+
+ def __unicode__(self):
+ return self.title
+
+__test__ = {'API_TESTS':"""
+
+>>> from django import forms
+>>> from django.contrib import admin
+>>> from django.contrib.admin.validation import validate
+
+#
+# Regression test for #8027: custom ModelForms with fields/fieldsets
+#
+
+>>> class SongForm(forms.ModelForm):
+... pass
+
+>>> class ValidFields(admin.ModelAdmin):
+... form = SongForm
+... fields = ['title']
+
+>>> class InvalidFields(admin.ModelAdmin):
+... form = SongForm
+... fields = ['spam']
+
+>>> validate(ValidFields, Song)
+>>> validate(InvalidFields, Song)
+Traceback (most recent call last):
+ ...
+ImproperlyConfigured: 'InvalidFields.fields' refers to field 'spam' that is
missing from the form.
+
+"""}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
