diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 0349396fa..79a356085 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -83,6 +83,14 @@ MANUFACTURER_ACTIONS = """ {% endif %} """ +PLATFORM_DEVICE_COUNT = """ +{{ value }} +""" + +PLATFORM_VM_COUNT = """ +{{ value }} +""" + PLATFORM_ACTIONS = """ {% if perms.dcim.change_platform %} @@ -380,10 +388,8 @@ class DeviceRoleTable(BaseTable): class PlatformTable(BaseTable): pk = ToggleColumn() - name = tables.LinkColumn(verbose_name='Name') - device_count = tables.Column(verbose_name='Devices') - vm_count = tables.Column(verbose_name='VMs') - slug = tables.Column(verbose_name='Slug') + device_count = tables.TemplateColumn(template_code=PLATFORM_DEVICE_COUNT, verbose_name='Devices') + vm_count = tables.TemplateColumn(template_code=PLATFORM_VM_COUNT, verbose_name='VMs') actions = tables.TemplateColumn( template_code=PLATFORM_ACTIONS, attrs={'td': {'class': 'text-right'}}, diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 32f04c223..9912cc566 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -37,6 +37,14 @@ UTILIZATION_GRAPH = """ {% if record.pk %}{% utilization_graph record.get_utilization %}{% else %}—{% endif %} """ +ROLE_PREFIX_COUNT = """ +{{ value }} +""" + +ROLE_VLAN_COUNT = """ +{{ value }} +""" + ROLE_ACTIONS = """ {% if perms.ipam.change_role %} @@ -220,9 +228,8 @@ class AggregateDetailTable(AggregateTable): class RoleTable(BaseTable): pk = ToggleColumn() - name = tables.Column(verbose_name='Name') - prefix_count = tables.Column(accessor=Accessor('count_prefixes'), orderable=False, verbose_name='Prefixes') - vlan_count = tables.Column(accessor=Accessor('count_vlans'), orderable=False, verbose_name='VLANs') + prefix_count = tables.TemplateColumn(accessor=Accessor('count_prefixes'), template_code=ROLE_PREFIX_COUNT, orderable=False, verbose_name='Prefixes') + vlan_count = tables.TemplateColumn(accessor=Accessor('count_vlans'), template_code=ROLE_VLAN_COUNT, orderable=False, verbose_name='VLANs') slug = tables.Column(verbose_name='Slug') actions = tables.TemplateColumn(template_code=ROLE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='')