Ticket #2555: checkfield_fix_v2.patch

django/forms/__init__.py

@@ -449 +449 @@
             (self.get_id(), self.__class__.__name__,
             self.field_name, checked_html)
 
+    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):

django/contrib/admin/media/js/CheckBox.js

@@ +1 @@
+var CheckBox = {
+    checkboxes: [],
+    init: function() {
+        var inputs = document.getElementsByTagName('input');
+        var num = 0;
+        for (i=0; i<inputs.length; i++) {
+            var inp = inputs[i];
+            if (inp.getAttribute('type') == 'checkbox' && inp.className.match(/vCheckboxField/)) {
+                CheckBox.checkboxes[num] = inp;
+                inp.setAttribute('onclick', 'CheckBox.toggleCheckBox('+num+'); return true;');
+                num++;
+            }
+        }
+        for (i=0;i<CheckBox.checkboxes.length;i++){
+            CheckBox.createHiddenField(CheckBox.checkboxes[i].id);
+        }
+    },
+    createHiddenField: function(id) {
+        if (document.getElementById(id + '_hidden') == null){
+            var inp = document.getElementById(id);
+            var input_box = document.createElement('input');
+            input_box.id = inp.id + '_hidden';
+            input_box.name = inp.name + '_hidden';
+            input_box.setAttribute('type', 'hidden');
+            if (inp.checked) {
+                input_box.value = 'on';
+            } else {
+                input_box.value = 'off';
+            }
+            inp.parentNode.insertBefore(input_box, inp);
+        }
+    },
+    toggleCheckBox: function(num) {
+        var vis = CheckBox.checkboxes[num];
+        var hidden = document.getElementById(vis.id + '_hidden');
+        if (vis.checked) { 
+            hidden.value = 'on';
+        } else { 
+            hidden.value = 'off';
+        }
+   }
+}
+
+addEvent(window, 'load', CheckBox.init);
+ No newline at end of file

django/contrib/admin/views/main.py

@@ -85 +85 @@
         js.append('js/urlify.js')
     if opts.has_field_type(models.DateTimeField) or opts.has_field_type(models.TimeField) or opts.has_field_type(models.DateField):
         js.extend(['js/calendar.js', 'js/admin/DateTimeShortcuts.js'])
+    if opts.has_field_type(models.BooleanField):
+        js.extend(['js/CheckBox.js'])
     if opts.get_ordered_objects():
         js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
     if opts.admin.js: