Ticket #899: 899.diff

django/db/models/fields/__init__.py

@@ -391 +391 @@
-        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
-        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)
-

tests/regressiontests/forms/tests.py

@@ -3858 +3858 @@
-
-"""
-
+from django.db import models
+import datetime
+
+class Foo(models.Model):
+    name = models.CharField(max_length=256, default='class wide default value')
+    date = models.DateField(default = datetime.date(1980, 1, 1))
+    value = models.IntegerField(default=42)
+
+formfield_initial_from_default_tests = ur"""
+>>> from django import newforms as forms
+>>> FooForm = forms.form_for_model(Foo)
+>>> FooForm().fields['name'].initial
+'class wide default value'
+>>> FooForm().fields['date'].initial
+datetime.date(1980, 1, 1)
+>>> FooForm().fields['value'].initial
+42
+>>> foo_instance = Foo(name='instance value', date = datetime.date(1969, 4, 4), value = 12)
+>>> InstanceForm = forms.form_for_instance(foo_instance)
+>>> InstanceForm().fields['name'].initial
+'instance value'
+>>> InstanceForm().fields['date'].initial
+datetime.date(1969, 4, 4)
+>>> InstanceForm().fields['value'].initial
+12
+    """
+
-__test__ = {
-    'form_tests': form_tests,
-    'localflavor': localflavor_tests,
-    'regressions': regression_tests,
-    'util_tests': util_tests,
+    'formfield_initial_from_default_tests' : formfield_initial_from_default_tests,
-}
-
-if __name__ == "__main__":