innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Repaired an oversight from [8772] that let made certain types of fields with choices fail. Fixes #6967 again. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2008-09-01 19:20:03 +00:00
parent ea05e61b2b
commit d7e9bb0571
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/db/models/fields/__init__.py
View File

@ -304,16 +304,28 @@ class Field(object):
def formfield(self, form_class=forms.CharField, **kwargs): def formfield(self, form_class=forms.CharField, **kwargs):
"Returns a django.forms.Field instance for this database Field." "Returns a django.forms.Field instance for this database Field."
defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}
if self.has_default():
defaults['initial'] = self.get_default()
if self.choices: if self.choices:
form_class = forms.TypedChoiceField # Fields with choices get special treatment.
include_blank = self.blank or not (self.has_default() or 'initial' in kwargs) include_blank = self.blank or not (self.has_default() or 'initial' in kwargs)
defaults['choices'] = self.get_choices(include_blank=include_blank) defaults['choices'] = self.get_choices(include_blank=include_blank)
defaults['coerce'] = self.to_python defaults['coerce'] = self.to_python
if self.null: if self.null:
defaults['empty_value'] = None defaults['empty_value'] = None
kwargs.pop('max_length', None)
if self.has_default(): form_class = forms.TypedChoiceField
defaults['initial'] = self.get_default()
# Many of the subclass-specific formfield arguments (min_value,
# max_value) don't apply for choice fields, so be sure to only pass
# the values that TypedChoiceField will understand.
for k in kwargs.keys():
if k not in ('coerce', 'empty_value', 'choices', 'required',
'widget', 'label', 'initial', 'help_text',
'error_messages'):
del kwargs[k]
defaults.update(kwargs) defaults.update(kwargs)
return form_class(**defaults) return form_class(**defaults)

2
tests/modeltests/model_forms/models.py
View File

@ -55,7 +55,7 @@ class Article(models.Model):
writer = models.ForeignKey(Writer) writer = models.ForeignKey(Writer)
article = models.TextField() article = models.TextField()
categories = models.ManyToManyField(Category, blank=True) categories = models.ManyToManyField(Category, blank=True)
status = models.IntegerField(choices=ARTICLE_STATUS, blank=True, null=True) status = models.PositiveIntegerField(choices=ARTICLE_STATUS, blank=True, null=True)
def save(self): def save(self):
import datetime import datetime