Changeset 6568

Timestamp:

10/20/07 08:01:40 (1 year ago)

Author:

mtredinnick

Message:

Fixed #899 -- Use model field default values as formfield initial values in
form_for_model(). Patch from David Danier and PhiR. Thanks.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/models.py (modified) (1 diff)

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

@@ -392 +392 @@
-        if self.choices:
-            defaults['widget'] = forms.Select(choices=self.get_choices())
+        if self.has_default():
+            defaults['initial'] = self.get_default()
-        defaults.update(kwargs)
-        return form_class(**defaults)

django/trunk/tests/regressiontests/forms/models.py

@@ +1 @@
+import datetime
+
-from django.db import models
-
- 
+
-    positive_integer = models.PositiveIntegerField(null=True, blank=True)
-
+
+
+
+
+
+
-__test__ = {'API_TESTS': """
-
+, form_for_instance
-
-# Boundary conditions on a PostitiveIntegerField #########################
- 
- 
- 
+
+
+
-True
- 
- 
+
+
-True
- 
- 
+
+
-False
-
+# Formfield initial values ########
+If the model has default values for some fields, they are used as the formfield
+initial values.
+>>> DefaultsForm = form_for_model(Defaults)
+>>> DefaultsForm().fields['name'].initial
+u'class default value'
+>>> DefaultsForm().fields['date'].initial
+datetime.date(1980, 1, 1)
+>>> DefaultsForm().fields['value'].initial
+42
+
+In form_for_instance(), the initial values come from the instance's values, not
+the model's defaults.
+>>> foo_instance = Defaults(name=u'instance value', date = datetime.date(1969, 4, 4), value = 12)
+>>> InstanceForm = form_for_instance(foo_instance)
+>>> InstanceForm().fields['name'].initial
+u'instance value'
+>>> InstanceForm().fields['date'].initial
+datetime.date(1969, 4, 4)
+>>> InstanceForm().fields['value'].initial
+12
-"""}