From 87651acb241ab35dc27446709a0d8b7f64c736c8 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Mon, 3 Oct 2016 16:47:36 +0100 Subject: [PATCH] [#270] ports search vlan column not populated in CSV output --- Netdisco/Changes | 1 + Netdisco/share/views/ajax/search/port_csv.tt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 2bb511ca..521f4eb9 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -23,6 +23,7 @@ * portcontrol and power jobs using device instance instead of IP address * [#266] netdisco subnet utiiization report div by zero (V. Puchkov) * 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 diff --git a/Netdisco/share/views/ajax/search/port_csv.tt b/Netdisco/share/views/ajax/search/port_csv.tt index 4bc2e37d..e9aa5db8 100644 --- a/Netdisco/share/views/ajax/search/port_csv.tt +++ b/Netdisco/share/views/ajax/search/port_csv.tt @@ -1,10 +1,10 @@ [% USE CSV -%] -[% CSV.dump([ 'Description' 'Port' 'Name' 'Vlan' ]) %] +[% CSV.dump([ 'Name' 'Port' 'Description' 'Vlan' ]) %] [% FOREACH row IN results %] [% mylist = [] %] - [% myport = "$row.ip [ $row.port ] (" _ row.device.dns _ ")" IF row.device.dns %] - [% FOREACH col IN [ row.name myport row.descr row.vlan ] %] + [% 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.port_vlans.vlan ] %] [% mylist.push(col) %] [% END %] [% CSV.dump(mylist) %]