summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-20 13:01:40 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-20 13:01:40 +0000
commitf20b254cccfecccaf81df8851790a0e033245d47 (patch)
tree32ebee9876fd87db70bfbee331daae028b430670 /django
parentb7687fae2d04c3cee88b0c707f9f2c2176e3f515 (diff)
Fixed #899 -- Use model field default values as formfield initial values in
form_for_model(). Patch from David Danier and PhiR. Thanks. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 0fff96b230..20a4f11f1d 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -391,6 +391,8 @@ class Field(object):
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)