diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 8d11d8f77..9578b4407 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -169,12 +169,8 @@ VLAN_MEMBER_ACTIONS = """ """ TENANT_LINK = """ -{% if record.tenant and record.tenant.group %} - {{record.tenant.group}}:{{ record.tenant }} -{% elif record.tenant %} +{% if record.tenant %} {{ record.tenant }} -{% elif record.vrf.tenant.group %} - {{record.vrf.tenant.group}}:{{ record.vrf.tenant }}* {% elif record.vrf.tenant %} {{ record.vrf.tenant }}* {% else %} diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py index 4bb8a4f77..884bdc3df 100644 --- a/netbox/tenancy/tables.py +++ b/netbox/tenancy/tables.py @@ -20,16 +20,6 @@ COL_TENANT = """ {% endif %} """ -COL_TENANTGROUP_TENANT = """ -{% if record.tenant and record.tenant.group %} - {{record.tenant.group}}:{{ record.tenant }} -{% elif record.tenant %} - {{ record.tenant }} -{% else %} - — -{% endif %} -""" - # # Tenant groups