diff --git a/changelog.d/2160.added.md b/changelog.d/2160.added.md new file mode 100644 index 0000000000..1a9cf4feb5 --- /dev/null +++ b/changelog.d/2160.added.md @@ -0,0 +1 @@ +Show VLAN description in ipdevinfo portslist diff --git a/python/nav/models/manage.py b/python/nav/models/manage.py index 0beec174e7..aa58e34bc2 100644 --- a/python/nav/models/manage.py +++ b/python/nav/models/manage.py @@ -2005,6 +2005,13 @@ def audit_logname(self): ifname=self.ifname, netbox=self.netbox.get_short_sysname() ) + @property + def vlan_description(self): + if self.vlan is None: + return None + swportvlan = self.swport_vlans.filter(vlan__vlan=self.vlan).first() + return swportvlan.vlan.description if swportvlan else None + @classmethod def sort_ports_by_ifname(cls, ports): return sorted(ports, key=lambda p: nav.natsort.split(p.ifname)) diff --git a/python/nav/web/api/v1/serializers.py b/python/nav/web/api/v1/serializers.py index 43162e69ff..8dd67543b0 100644 --- a/python/nav/web/api/v1/serializers.py +++ b/python/nav/web/api/v1/serializers.py @@ -360,6 +360,7 @@ class InterfaceSerializer(serializers.ModelSerializer): source='get_bundled_interfaces', many=True ) netbox = SubNetboxSerializer() + vlan_description = serializers.CharField(read_only=True) class Meta(object): model = manage.Interface diff --git a/python/nav/web/static/js/src/porttable.js b/python/nav/web/static/js/src/porttable.js index aab2ba0a7c..707ef3d018 100644 --- a/python/nav/web/static/js/src/porttable.js +++ b/python/nav/web/static/js/src/porttable.js @@ -71,6 +71,13 @@ define(function(require) { } }, + { + data: "vlan_description", + render: function(data, type, row, meta) { + return data; + } + }, + { data: "speed", render: function(data, type, row, meta) { @@ -163,7 +170,7 @@ define(function(require) { fixSearchDelay(this.dataTable); // Special treatment for the last used column that is an optional column - var lastUsedColIndex = 8; + var lastUsedColIndex = 9; var lastUsedColumn = this.dataTable.column(lastUsedColIndex); // Create form, add handlers diff --git a/python/nav/web/templates/ipdevinfo/frag-portlist-datatable.html b/python/nav/web/templates/ipdevinfo/frag-portlist-datatable.html index d1c1414b2b..a595a1dac2 100644 --- a/python/nav/web/templates/ipdevinfo/frag-portlist-datatable.html +++ b/python/nav/web/templates/ipdevinfo/frag-portlist-datatable.html @@ -8,6 +8,7 @@ Admin Link Vlan + Vlan description Speed Last used