Ticket #2555: checkfield_fix.patch

django/forms/__init__.py

@@ -443 +443 @@
 
     def render(self, data):
         checked_html = ''
+        field_id = self.get_id()
+        htmldata = data and 'on' or 'off'
         if data or (data is '' and self.checked_by_default):
             checked_html = ' checked="checked"'
-        return '<input type="checkbox" id="%s" class="v%s" name="%s"%s />' % \
-            (self.get_id(), self.__class__.__name__,
-            self.field_name, checked_html)
+        output = ['''<script>
+      function toggle_%(id)s_boolean() {
+        vis = document.getElementById('%(id)s');
+        hidden = document.getElementById('%(id)s_hidden');
+        if (vis.checked) { hidden.value = 'on';
+        } else { hidden.value = 'off';
+        }
+        return true;
+      }
+      function create_%(id)s_hidden() {
+        hidden = document.getElementById('dummy_%(id)s_hidden');
+        hidden.innerHTML = '<input type="hidden" id="%(id)s_hidden" name="%(name)s_hidden" value="%(value)s" />';
+      }
+      </script>''' % {'id': field_id, 'name': self.field_name, 'value': escape(htmldata) }]
+        output.append('<input type="checkbox" id="%s" class="v%s" name="%s" onClick="toggle_%s_boolean(); return true;" %s />' % \
+            (field_id, self.__class__.__name__,
+            self.field_name, field_id, checked_html))
+        output.append('<span id="dummy_%s_hidden"></span>' % field_id)
+        output.append('<script>create_%s_hidden();</script>' % field_id)
+        return '\n'.join(output)
 
+    def run_validator(self, new_data, validator):
+        """ overridden to have the right behaviour with validators when no data is posted """
+        if new_data.has_key('%s_hidden' % self.field_name) and not new_data.has_key(self.field_name):
+            # we use internally hidden field with right value
+            new_data[self.field_name] = new_data.get('%s_hidden' % self.field_name)
+        super(CheckboxField, self).run_validator(new_data, validator)
+
     def html2python(data):
         "Convert value from browser ('on' or '') to a Python boolean"
         if data == 'on':
             return True
-        return False
+        return False # if not set or set to 'off'
     html2python = staticmethod(html2python)
 
 class SelectField(FormField):