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

[#270] ports search vlan column not populated in CSV output

Browse Source
This commit is contained in:
Oliver Gorwits
2016-10-03 16:47:36 +01:00
parent efe7137cd8
commit 87651acb24
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -23,6 +23,7 @@
* portcontrol and power jobs using device instance instead of IP address * portcontrol and power jobs using device instance instead of IP address
* [#266] netdisco subnet utiiization report div by zero (V. Puchkov) * [#266] netdisco subnet utiiization report div by zero (V. Puchkov)
* Missing display name for device when device has no DNS * Missing display name for device when device has no DNS
* [#270] ports search vlan column not populated in CSV output
2.033006 - 2016-03-20 2.033006 - 2016-03-20

6
Netdisco/share/views/ajax/search/port_csv.tt
View File

@@ -1,10 +1,10 @@
[% USE CSV -%] [% USE CSV -%]
[% CSV.dump([ 'Description' 'Port' 'Name' 'Vlan' ]) %] [% CSV.dump([ 'Name' 'Port' 'Description' 'Vlan' ]) %]
[% FOREACH row IN results %] [% FOREACH row IN results %]
[% mylist = [] %] [% mylist = [] %]
[% myport = "$row.ip [ $row.port ] (" _ row.device.dns _ ")" IF row.device.dns %] [% myport = "$row.ip [ $row.port ] (" _ (row.device.dns || row.device.name) _ ")" IF (row.device.dns || row.device.name) %]
[% FOREACH col IN [ row.name myport row.descr row.vlan ] %] [% FOREACH col IN [ row.name myport row.descr row.port_vlans.vlan ] %]
[% mylist.push(col) %] [% mylist.push(col) %]
[% END %] [% END %]
[% CSV.dump(mylist) %] [% CSV.dump(mylist) %]