Fixed #2300 -- Added required "value" attribute to CheckboxSelectMultipleField

form field. Converted the submitted data for the same field back into something
we can work with. Thanks, lerouxb@gmail.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2006-09-26 04:37:10 +00:00
parent 11416e4a54
commit be053df693
1 changed files with 2 additions and 1 deletions

View File

@ -54,6 +54,7 @@ class Manipulator(object):
def get_validation_errors(self, new_data): def get_validation_errors(self, new_data):
"Returns dictionary mapping field_names to error-message lists" "Returns dictionary mapping field_names to error-message lists"
errors = {} errors = {}
self.prepare(new_data)
for field in self.fields: for field in self.fields:
errors.update(field.get_validation_errors(new_data)) errors.update(field.get_validation_errors(new_data))
val_name = 'validate_%s' % field.field_name val_name = 'validate_%s' % field.field_name
@ -638,7 +639,7 @@ class CheckboxSelectMultipleField(SelectMultipleField):
if str(value) in str_data_list: if str(value) in str_data_list:
checked_html = ' checked="checked"' checked_html = ' checked="checked"'
field_name = '%s%s' % (self.field_name, value) field_name = '%s%s' % (self.field_name, value)
output.append('<li><input type="checkbox" id="%s" class="v%s" name="%s"%s /> <label for="%s">%s</label></li>' % \ output.append('<li><input type="checkbox" id="%s" class="v%s" name="%s"%s value="on" /> <label for="%s">%s</label></li>' % \
(self.get_id() + escape(value), self.__class__.__name__, field_name, checked_html, (self.get_id() + escape(value), self.__class__.__name__, field_name, checked_html,
self.get_id() + escape(value), choice)) self.get_id() + escape(value), choice))
output.append('</ul>') output.append('</ul>')