Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed #3196 -- Fixed inconsistency in setting choices on ChoiceFields…
… dynamically

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
adrianholovaty committed Jan 21, 2007
1 parent f073318 commit 76f6dd4
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
11 changes: 10 additions & 1 deletion django/newforms/fields.py
Expand Up @@ -320,10 +320,19 @@ class ChoiceField(Field):
def __init__(self, choices=(), required=True, widget=Select, label=None, initial=None):
if isinstance(widget, type):
widget = widget()
widget.choices = choices
super(ChoiceField, self).__init__(required, widget, label, initial)
self.choices = choices

def _get_choices(self):
return self._choices

def _set_choices(self, value):
# Setting choices also sets the choices on the widget.
self._choices = value
self.widget.choices = value

choices = property(_get_choices, _set_choices)

def clean(self, value):
"""
Validates that the input is in self.choices.
Expand Down
15 changes: 15 additions & 0 deletions tests/regressiontests/forms/tests.py
Expand Up @@ -1866,6 +1866,21 @@
<option value="J">Java</option>
</select>
You can set a ChoiceField's choices after the fact.
>>> class FrameworkForm(Form):
... name = CharField()
... language = ChoiceField()
>>> f = FrameworkForm(auto_id=False)
>>> print f['language']
<select name="language">
</select>
>>> f.fields['language'].choices = [('P', 'Python'), ('J', 'Java')]
>>> print f['language']
<select name="language">
<option value="P">Python</option>
<option value="J">Java</option>
</select>
Add widget=RadioSelect to use that widget with a ChoiceField.
>>> class FrameworkForm(Form):
... name = CharField()
Expand Down

0 comments on commit 76f6dd4

Please sign in to comment.