From debc8521a5e92a17dd064f8f06bb1549816fef64 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 14 Mar 2018 15:18:24 -0400 Subject: [PATCH] Closes #1968: Link device type instance count to filtered device list --- netbox/dcim/tables.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index d6e9cfdfe..e71395ebc 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -133,6 +133,10 @@ SUBDEVICE_ROLE_TEMPLATE = """ {% if record.subdevice_role == True %}Parent{% elif record.subdevice_role == False %}Child{% else %}—{% endif %} """ +DEVICETYPE_INSTANCES_TEMPLATE = """ +{{ record.instance_count }} +""" + UTILIZATION_GRAPH = """ {% load helpers %} {% utilization_graph value %} @@ -313,13 +317,23 @@ class ManufacturerTable(BaseTable): class DeviceTypeTable(BaseTable): pk = ToggleColumn() - model = tables.LinkColumn('dcim:devicetype', args=[Accessor('pk')], verbose_name='Device Type') + model = tables.LinkColumn( + viewname='dcim:devicetype', + args=[Accessor('pk')], + verbose_name='Device Type' + ) is_full_depth = tables.BooleanColumn(verbose_name='Full Depth') is_console_server = tables.BooleanColumn(verbose_name='CS') is_pdu = tables.BooleanColumn(verbose_name='PDU') is_network_device = tables.BooleanColumn(verbose_name='Net') - subdevice_role = tables.TemplateColumn(SUBDEVICE_ROLE_TEMPLATE, verbose_name='Subdevice Role') - instance_count = tables.Column(verbose_name='Instances') + subdevice_role = tables.TemplateColumn( + template_code=SUBDEVICE_ROLE_TEMPLATE, + verbose_name='Subdevice Role' + ) + instance_count = tables.TemplateColumn( + template_code=DEVICETYPE_INSTANCES_TEMPLATE, + verbose_name='Instances' + ) class Meta(BaseTable.Meta): model = DeviceType