Changeset 8772

Timestamp:

08/31/08 15:11:11 (3 months ago)

Author:

jacob

Message:

Fixed #6967: ModelForms now validate choices. Thanks, mattmcc -- the failing test helped quite a bit.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (3 diffs)

django/trunk/django/db/models/fields/__init__.py

@@ -306 +306 @@
-        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
-        if self.choices:
-
+
+
+
+
+
+
+
-        if self.has_default():
-            defaults['initial'] = self.get_default()

django/trunk/tests/modeltests/model_forms/models.py

@@ -26 +26 @@
-    (2, 'Pending'),
-    (3, 'Live'),
+)
+
+ARTICLE_STATUS_CHAR = (
+    ('d', 'Draft'),
+    ('p', 'Pending'),
+    ('l', 'Live'),
-)
-
@@ -111 +117 @@
-    def __unicode__(self):
-        return self.field
+
+class ArticleStatus(models.Model):
+    status = models.CharField(max_length=2, choices=ARTICLE_STATUS_CHAR, blank=True, null=True)
-
-__test__ = {'API_TESTS': """
@@ -1124 +1133 @@
-u'1'
-
+# Choices on CharField and IntegerField
+
+>>> class ArticleForm(ModelForm):
+...     class Meta:
+...         model = Article
+>>> f = ArticleForm()
+>>> f.fields['status'].clean('42')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. 42 is not one of the available choices.']
+
+>>> class ArticleStatusForm(ModelForm):
+...     class Meta:
+...         model = ArticleStatus
+>>> f = ArticleStatusForm()
+>>> f.fields['status'].clean('z')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. z is not one of the available choices.']
+
-"""}