diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index 58775b378..ae81f9a5b 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -13,6 +13,14 @@ CIRCUITTYPE_ACTIONS = """ {% endif %} """ +TENANT_LINK = """ +{% if record.tenant %} + {{ record.tenant }} +{% else %} + — +{% endif %} +""" # # Providers @@ -60,7 +68,7 @@ class CircuitTable(BaseTable): pk = ToggleColumn() cid = tables.LinkColumn(verbose_name='ID') provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')]) - tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) + tenant = tables.TemplateColumn(TENANT_LINK) a_side = tables.LinkColumn( 'dcim:site', accessor=Accessor('termination_a.site'), orderable=False, args=[Accessor('termination_a.site.slug')] diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 427f0bb42..943065cef 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -112,6 +112,14 @@ UTILIZATION_GRAPH = """ {% utilization_graph value %} """ +TENANT_LINK = """ +{% if record.tenant %} + {{ record.tenant }} +{% else %} + — +{% endif %} +""" # # Regions @@ -141,7 +149,7 @@ class SiteTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() region = tables.TemplateColumn(template_code=SITE_REGION_LINK) - tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) + tenant = tables.TemplateColumn(TENANT_LINK) class Meta(BaseTable.Meta): model = Site @@ -207,7 +215,7 @@ class RackTable(BaseTable): name = tables.LinkColumn() site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')]) group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') - tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) + tenant = tables.TemplateColumn(TENANT_LINK) role = tables.TemplateColumn(RACK_ROLE) u_height = tables.TemplateColumn("{{ record.u_height }}U", verbose_name='Height') @@ -398,7 +406,7 @@ class DeviceTable(BaseTable): pk = ToggleColumn() name = tables.TemplateColumn(template_code=DEVICE_LINK) status = tables.TemplateColumn(template_code=DEVICE_STATUS, verbose_name='Status') - tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) + tenant = tables.TemplateColumn(TENANT_LINK) site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')]) rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')]) device_role = tables.TemplateColumn(DEVICE_ROLE, verbose_name='Role') diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 24bb9b3c2..99d46d6e8 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -134,9 +134,11 @@ VLANGROUP_ACTIONS = """ TENANT_LINK = """ {% if record.tenant %} - {{ record.tenant }} + {{ record.tenant }} {% elif record.vrf.tenant %} - {{ record.vrf.tenant }}* + {{ record.vrf.tenant }}* {% else %} — {% endif %} @@ -151,7 +153,7 @@ class VRFTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() rd = tables.Column(verbose_name='RD') - tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) + tenant = tables.TemplateColumn(TENANT_LINK) class Meta(BaseTable.Meta): model = VRF @@ -321,7 +323,7 @@ class VLANTable(BaseTable): vid = tables.LinkColumn('ipam:vlan', args=[Accessor('pk')], verbose_name='ID') site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')]) group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') - tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')]) + tenant = tables.TemplateColumn(TENANT_LINK) status = tables.TemplateColumn(STATUS_LABEL) role = tables.TemplateColumn(VLAN_ROLE_LINK) diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html index 418459a15..d3a084649 100644 --- a/netbox/templates/circuits/circuit_list.html +++ b/netbox/templates/circuits/circuit_list.html @@ -25,3 +25,11 @@ {% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html index 34b143fc5..e3a401e96 100644 --- a/netbox/templates/dcim/device_list.html +++ b/netbox/templates/dcim/device_list.html @@ -29,6 +29,7 @@ {% block javascript %} +{% endblock %} diff --git a/netbox/templates/ipam/ipaddress_list.html b/netbox/templates/ipam/ipaddress_list.html index 2d273145d..302ed1335 100644 --- a/netbox/templates/ipam/ipaddress_list.html +++ b/netbox/templates/ipam/ipaddress_list.html @@ -25,3 +25,11 @@ {% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html index 4747731f8..2102f669d 100644 --- a/netbox/templates/ipam/prefix_list.html +++ b/netbox/templates/ipam/prefix_list.html @@ -30,3 +30,11 @@ {% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/netbox/templates/ipam/vlan_list.html b/netbox/templates/ipam/vlan_list.html index b5db84e52..8f4b6cf17 100644 --- a/netbox/templates/ipam/vlan_list.html +++ b/netbox/templates/ipam/vlan_list.html @@ -26,3 +26,11 @@ {% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/netbox/templates/ipam/vrf_list.html b/netbox/templates/ipam/vrf_list.html index 029426a14..0f15a0a3f 100644 --- a/netbox/templates/ipam/vrf_list.html +++ b/netbox/templates/ipam/vrf_list.html @@ -26,3 +26,11 @@ {% endblock %} + +{% block javascript %} + +{% endblock %}