Ticket #9336: checkbox_false.diff

django/forms/widgets.py

@@ -314 +314 @@
         return super(TimeInput, self).render(name, value, attrs)
 
 class CheckboxInput(Widget):
-    def __init__(self, attrs=None, check_test=bool):
+    def __init__(self, attrs=None, check_test=lambda s: s != 'False' and bool(s)):
         super(CheckboxInput, self).__init__(attrs)
         # check_test is a callable that takes a value and returns True
         # if the checkbox should be checked for that value.
@@ -328 +328 @@
             result = False
         if result:
             final_attrs['checked'] = 'checked'
-        if value not in ('', True, False, None):
+        if value not in ('', True, False, 'True', 'False', None):
             # Only add the 'value' attribute if a value is non-empty.
             final_attrs['value'] = force_unicode(value)
         return mark_safe(u'<input%s />' % flatatt(final_attrs))

tests/regressiontests/forms/widgets.py

@@ -279 +279 @@
 >>> w.render('is_cool', 'foo')
 u'<input checked="checked" type="checkbox" name="is_cool" value="foo" />'
 
+A value of 'False' should be rendered unchecked
+>>> w.render('is_cool', 'False')
+u'<input type="checkbox" name="is_cool" />'
+
+'True' should be rendered without a value attribute
+>>> w.render('is_cool', 'True')
+u'<input checked="checked" type="checkbox" name="is_cool" />'
+
 >>> w.render('is_cool', False, attrs={'class': 'pretty'})
 u'<input type="checkbox" name="is_cool" class="pretty" />'