Adjust "null" to expected behavior (#521)

* Adjust "null" to expected behavior Add "not" to ensure that when null is True (making ` None or '' ` distinct from False) that the default placeholder (--) is rendered
jieter · Mar 8, 2018 · 82d5acb · 82d5acb
1 parent 8cf1687
commit 82d5acb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/django_tables2/columns/booleancolumn.py b/django_tables2/columns/booleancolumn.py
@@ -31,7 +31,7 @@ class BooleanColumn(Column):
     def __init__(self, null=False, yesno='✔,✘', **kwargs):
         self.yesno = (yesno.split(',') if isinstance(yesno, six.string_types)
                       else tuple(yesno))
-        if null:
+        if not null:
             kwargs['empty_values'] = ()
         super(BooleanColumn, self).__init__(**kwargs)
 

diff --git a/tests/columns/test_booleancolumn.py b/tests/columns/test_booleancolumn.py
@@ -24,7 +24,7 @@ class Meta:
 
         column = Table.base_columns['field']
         assert type(column) == tables.BooleanColumn
-        assert column.empty_values != ()
+        assert column.empty_values == ()
 
     def test_should_be_used_for_nullbooleanfield(self):
         class NullBoolModel(models.Model):
@@ -39,18 +39,18 @@ class Meta:
 
         column = Table.base_columns['field']
         assert type(column) == tables.BooleanColumn
-        assert column.empty_values == ()
+        assert column.empty_values != ()
 
     def test_treat_none_different_from_false(self):
         class Table(tables.Table):
-            col = tables.BooleanColumn(null=False, default='---')
+            col = tables.BooleanColumn(null=True, default='---')
 
         table = Table([{'col': None}])
         assert table.rows[0].get_cell('col') == '---'
 
     def test_treat_none_as_false(self):
         class Table(tables.Table):
-            col = tables.BooleanColumn(null=True)
+            col = tables.BooleanColumn(null=False, default='---')
 
         table = Table([{'col': None}])
         assert table.rows[0].get_cell('col') == '<span class="false">✘</span>'