mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
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
This commit is contained in:
parent
b7687fae2d
commit
f20b254ccc
@ -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)
|
||||
|
||||
|
@ -1,21 +1,49 @@
|
||||
import datetime
|
||||
|
||||
from django.db import models
|
||||
|
||||
class BoundaryModel(models.Model):
|
||||
class BoundaryModel(models.Model):
|
||||
positive_integer = models.PositiveIntegerField(null=True, blank=True)
|
||||
|
||||
|
||||
class Defaults(models.Model):
|
||||
name = models.CharField(max_length=256, default='class default value')
|
||||
date = models.DateField(default = datetime.date(1980, 1, 1))
|
||||
value = models.IntegerField(default=42)
|
||||
|
||||
__test__ = {'API_TESTS': """
|
||||
>>> from django.newforms import form_for_model
|
||||
>>> from django.newforms import form_for_model, form_for_instance
|
||||
|
||||
# Boundary conditions on a PostitiveIntegerField #########################
|
||||
>>> BoundaryForm = form_for_model(BoundaryModel)
|
||||
>>> f = BoundaryForm({'positive_integer':100})
|
||||
>>> f.is_valid()
|
||||
>>> BoundaryForm = form_for_model(BoundaryModel)
|
||||
>>> f = BoundaryForm({'positive_integer':100})
|
||||
>>> f.is_valid()
|
||||
True
|
||||
>>> f = BoundaryForm({'positive_integer':0})
|
||||
>>> f.is_valid()
|
||||
>>> f = BoundaryForm({'positive_integer':0})
|
||||
>>> f.is_valid()
|
||||
True
|
||||
>>> f = BoundaryForm({'positive_integer':-100})
|
||||
>>> f.is_valid()
|
||||
>>> f = BoundaryForm({'positive_integer':-100})
|
||||
>>> f.is_valid()
|
||||
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
|
||||
"""}
|
||||
|
Loading…
Reference in New Issue
Block a user