diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 2fa82dc43..70b297366 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -588,6 +588,9 @@ class BaseInterfaceTable(NetBoxTable): def value_ip_addresses(self, value): return ",".join([str(obj.address) for obj in value.all()]) + def value_tagged_vlans(self, value): + return ",".join([str(obj) for obj in value.all()]) + class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpointTable): device = tables.Column( diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index d3134656c..96ab803e6 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -56,9 +56,13 @@ INTERFACE_FHRPGROUPS = """ INTERFACE_TAGGED_VLANS = """ {% if record.mode == 'tagged' %} + {% if value.count > 3 %} + {{ value.count }} VLANs + {% else %} {% for vlan in value.all %} {{ vlan }}
{% endfor %} + {% endif %} {% elif record.mode == 'tagged-all' %} All {% endif %}