fix more CheckBox annoyances

Author: anandology

web/form.py

@@ -106,7 +106,7 @@ def get(self, i, default=None):
  return default
 
  def _get_d(self): #@@ should really be form.attr, no?
- return utils.storage([(i.name, i.value) for i in self.inputs])
+ return utils.storage([(i.name, i.get_value()) for i in self.inputs])
  d = property(_get_d)
 
 class Input(object):
@@ -148,6 +148,9 @@ def validate(self, value):
  def set_value(self, value):
  self.value = value
 
+ def get_value(self):
+ return self.value
+
  def render(self):
  attrs = self.attrs.copy()
  attrs['type'] = self.get_type()
@@ -281,7 +284,8 @@ def __init__(self, name, *validators, **attrs):
  Input.__init__(self, name, *validators, **attrs)
 
  def get_default_id(self):
- return self.name + '_' + self.value.replace(' ', '_')
+ value = self.value or ""
+ return self.name + '_' + value.replace(' ', '_')
 
  def render(self):
  attrs = self.attrs.copy()
@@ -297,6 +301,9 @@ def set_value(self, value):
  if value:
  self.checked = True
 
+ def get_value(self):
+ return self.checked
+
 class Button(Input):
  def __init__(self, name, *validators, **attrs):
  super(Button, self).__init__(name, *validators, **attrs)