135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#882 update device port csv for vlan names patch

Browse Source
This commit is contained in:
Oliver Gorwits
2022-07-26 21:28:13 +01:00
parent 56ce4956cc
commit b08eb18315
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/views/ajax/device/ports_csv.tt
View File

@@ -3,7 +3,7 @@
[% SET headers = [] %]
[% SET c_nodes_pos = -1 %]
[% FOREACH item IN settings.port_columns %]
[% NEXT IF item.name == 'c_admin' %]
[% NEXT IF item.name == 'c_admin' OR item.name == 'c_vlan_names' %]
[% NEXT UNLESS params.${item.name} %]
[% IF item.name == 'c_nodes' %]
@@ -108,13 +108,15 @@
[% END %]
[% IF params.c_pvid %]
[% myport.push(row.vlan) %]
[% myport.push(params.c_vlan_names ? row.get_column('native_vlan_name') : row.vlan) %]
[% END %]
[% IF params.c_vmember %]
[% SET portname = row.port %]
[% SET output = '' %]
[% FOREACH vlan IN vlans.$portname.vlan_set.nsort %]
[% IF params.c_vlan_names %][% SET vlanlist = vlans.$portname.vlan_name_set.sort %]
[% ELSE %][% SET vlanlist = vlans.$portname.vlan_set.nsort %][% END %]
[% FOREACH vlan IN vlanlist %]
[% SET output = output _ ',' IF NOT loop.first %]
[% SET output = output _ vlan %]
[% END %]