Explorar el Código

Standardize usage of BooleanColumn

Jeremy Stretch hace 5 años
padre
commit
2bc524a2ee
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. 1 1
      netbox/ipam/tables.py
  2. 4 4
      netbox/utilities/tables.py

+ 1 - 1
netbox/ipam/tables.py

@@ -415,7 +415,7 @@ class IPAddressDetailTable(IPAddressTable):
     tenant = tables.TemplateColumn(
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
         template_code=COL_TENANT
     )
     )
-    assigned = tables.BooleanColumn(
+    assigned = BooleanColumn(
         accessor='assigned_object_id',
         accessor='assigned_object_id',
         verbose_name='Assigned'
         verbose_name='Assigned'
     )
     )

+ 4 - 4
netbox/utilities/tables.py

@@ -114,12 +114,12 @@ class BooleanColumn(tables.Column):
     character.
     character.
     """
     """
     def render(self, value):
     def render(self, value):
-        if value is True:
+        if value:
             rendered = '<span class="text-success"><i class="fa fa-check"></i></span>'
             rendered = '<span class="text-success"><i class="fa fa-check"></i></span>'
-        elif value is False:
-            rendered = '<span class="text-danger"><i class="fa fa-close"></i></span>'
-        else:
+        elif value is None:
             rendered = '<span class="text-muted">&mdash;</span>'
             rendered = '<span class="text-muted">&mdash;</span>'
+        else:
+            rendered = '<span class="text-danger"><i class="fa fa-close"></i></span>'
         return mark_safe(rendered)
         return mark_safe(rendered)