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

further to commit 5efdd750 also for csv output

Browse Source
This commit is contained in:
Oliver Gorwits
2017-07-08 19:32:12 +01:00
parent 07e93df37c
commit 46c0b6b6e0
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/App/Netdisco/Web/Plugin/Device/Ports.pm
View File

@@ -185,6 +185,7 @@ get '/ajax/content/device/ports' => require_login sub {
template 'ajax/device/ports_csv.tt', { template 'ajax/device/ports_csv.tt', {
results => $results, results => $results,
nodes => $nodes_name, nodes => $nodes_name,
ips => $ips_name,
device => $device, device => $device,
}, { layout => undef }; }, { layout => undef };
} }

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

@@ -190,8 +190,7 @@
[% mynode.push('') %] [% mynode.push('') %]
[% SET has_ips = 0 %] [% SET has_ips = 0 %]
[% IF params.n_ip4 %] [% FOREACH ip IN node.$ips %]
[% FOREACH ip IN node.ip4s %]
[% SET has_ips = 1 %] [% SET has_ips = 1 %]
[% CALL mynode.splice(-3, 1, ip.ip) %] [% CALL mynode.splice(-3, 1, ip.ip) %]
@@ -201,20 +200,6 @@
[% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %] [% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %]
[% CSV.dump(myport) %] [% CSV.dump(myport) %]
[% END %] [% END %]
[% END %]
[% IF params.n_ip6 %]
[% FOREACH ip IN node.ip6s %]
[% SET has_ips = 1 %]
[% CALL mynode.splice(-3, 1, ip.ip) %]
[% CALL mynode.splice(-2, 1, ip.dns) %]
[% CALL mynode.splice(-1, 1, (ip.active ? 'No' : 'Yes')) %]
[% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %]
[% CSV.dump(myport) %]
[% END %]
[% END %]
[% CSV.dump(myport) IF NOT has_ips %] [% CSV.dump(myport) IF NOT has_ips %]
[% ELSE %] [% ELSE %]