From 6604ebfd01a53671dab653ffb6084e3b56d9af39 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 22 Feb 2022 13:10:04 -0500 Subject: [PATCH] Fix tag background color --- netbox/netbox/tables/columns.py | 2 +- netbox/utilities/templatetags/builtins/tags.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 2e28a66e3..5ec84d5b6 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -217,7 +217,7 @@ class ChoiceFieldColumn(tables.Column): # Determine the background color to use (try calling object.get_FOO_color()) try: - bg_color = getattr(record, f'get_{bound_column.name}_color')() + bg_color = getattr(record, f'get_{bound_column.name}_color')() or self.DEFAULT_BG_COLOR except AttributeError: bg_color = self.DEFAULT_BG_COLOR diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py index a6c631efc..666b6a31c 100644 --- a/netbox/utilities/templatetags/builtins/tags.py +++ b/netbox/utilities/templatetags/builtins/tags.py @@ -19,7 +19,7 @@ def tag(value, viewname=None): @register.inclusion_tag('builtins/badge.html') -def badge(value, bg_color='secondary', show_empty=False): +def badge(value, bg_color=None, show_empty=False): """ Display the specified number as a badge. @@ -30,7 +30,7 @@ def badge(value, bg_color='secondary', show_empty=False): """ return { 'value': value, - 'bg_color': bg_color, + 'bg_color': bg_color or 'secondary', 'show_empty': show_empty, }