Fixed #3821 -- Added a widget class attribute to ChoiceField and
MultipleChoiceField. This makes them consistent with other field classes and make subclassing easier. This is a backwards compatible change. Thanks, Max Dekachev. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
2a512a4e83
commit
15d5c3decb
1
AUTHORS
1
AUTHORS
|
@ -78,6 +78,7 @@ answer newbie questions, and generally made Django that much better:
|
||||||
Jason Davies (Esaj) <http://www.jasondavies.com/>
|
Jason Davies (Esaj) <http://www.jasondavies.com/>
|
||||||
Alex Dedul
|
Alex Dedul
|
||||||
deric@monowerks.com
|
deric@monowerks.com
|
||||||
|
Max Derkachev <mderk@yandex.ru>
|
||||||
dne@mayonnaise.net
|
dne@mayonnaise.net
|
||||||
Maximillian Dornseif <md@hudora.de>
|
Maximillian Dornseif <md@hudora.de>
|
||||||
Jeremy Dunck <http://dunck.us/>
|
Jeremy Dunck <http://dunck.us/>
|
||||||
|
|
|
@ -332,7 +332,9 @@ class NullBooleanField(BooleanField):
|
||||||
return {True: True, False: False}.get(value, None)
|
return {True: True, False: False}.get(value, None)
|
||||||
|
|
||||||
class ChoiceField(Field):
|
class ChoiceField(Field):
|
||||||
def __init__(self, choices=(), required=True, widget=Select, label=None, initial=None, help_text=None):
|
widget = Select
|
||||||
|
|
||||||
|
def __init__(self, choices=(), required=True, widget=None, label=None, initial=None, help_text=None):
|
||||||
super(ChoiceField, self).__init__(required, widget, label, initial, help_text)
|
super(ChoiceField, self).__init__(required, widget, label, initial, help_text)
|
||||||
self.choices = choices
|
self.choices = choices
|
||||||
|
|
||||||
|
@ -364,9 +366,7 @@ class ChoiceField(Field):
|
||||||
|
|
||||||
class MultipleChoiceField(ChoiceField):
|
class MultipleChoiceField(ChoiceField):
|
||||||
hidden_widget = MultipleHiddenInput
|
hidden_widget = MultipleHiddenInput
|
||||||
|
widget = SelectMultiple
|
||||||
def __init__(self, choices=(), required=True, widget=SelectMultiple, label=None, initial=None, help_text=None):
|
|
||||||
super(MultipleChoiceField, self).__init__(choices, required, widget, label, initial, help_text)
|
|
||||||
|
|
||||||
def clean(self, value):
|
def clean(self, value):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue