diff --git a/netbox/dcim/tables/cables.py b/netbox/dcim/tables/cables.py index 330ef4362..a8a9a6bc1 100644 --- a/netbox/dcim/tables/cables.py +++ b/netbox/dcim/tables/cables.py @@ -6,7 +6,7 @@ from django.utils.safestring import mark_safe from dcim.models import Cable from netbox.tables import NetBoxTable, columns from tenancy.tables import TenancyColumnsMixin -from .template_code import CABLE_LENGTH +from .template_code import CABLE_LENGTH, CABLE_BUTTONS __all__ = ( 'CableTable', @@ -117,7 +117,7 @@ class CableTable(TenancyColumnsMixin, NetBoxTable): url_name='dcim:cable_list' ) actions = columns.ActionsColumn( - extra_buttons='{% if record.get_trace_url %}{% endif %}' + extra_buttons=CABLE_BUTTONS ) class Meta(NetBoxTable.Meta): diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index e0f38afef..a3089dba6 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -15,6 +15,12 @@ CABLE_LENGTH = """ {% if record.length %}{{ record.length|floatformat:"-2" }} {{ record.length_unit }}{% endif %} """ +CABLE_BUTTONS = """ +{% if record.get_trace_url %} + +{% endif %} +""" + WEIGHT = """ {% load helpers %} {% if value %}{{ value|floatformat:"-2" }} {{ record.weight_unit }}{% endif %} diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index e79086f43..4436feccf 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -18,16 +18,11 @@ {% trans "Status" %} - {% badge object.get_status_display bg_color=object.get_status_color %} - - {% if object.get_trace_url %} - - Trace - + {% badge object.get_status_display bg_color=object.get_status_color %} + {% if object.get_trace_url %} {% endif %} - {% endif %} {% trans "Tenant" %}