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

[#237] Show IPv4 and/or IPv6 nodes separately in Device Ports table

Browse Source
This commit is contained in:
Oliver Gorwits
2015-08-26 12:14:42 +01:00
parent 7fdf6e6776
commit b8cb94aadf
8 changed files with 128 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -331,8 +331,19 @@
)
[% END %]
[% ' (' _ node.time_last_age _ ')' IF params.n_age %]
[% IF params.n_ip %]
[% FOREACH ip IN node.ips %]
[% IF params.n_ip4 %]
[% FOREACH ip IN node.ip4s %]
<br/>&nbsp; [% '<i class="icon-book"></i>&nbsp; ' IF NOT ip.active %]
[% SET dns = ip.dns %]
[% IF dns %]
<a href="[% search_node %]&q=[% ip.ip | uri %]">[% dns %] ([% ip.ip | html_entity %])</a>
[% ELSE %]
<a href="[% search_node %]&q=[% ip.ip | uri %]">[% ip.ip | html_entity %]</a>
[% END %]
[% END %]
[% END %]
[% IF params.n_ip6 %]
[% FOREACH ip IN node.ip6s %]
<br/>&nbsp; [% '<i class="icon-book"></i>&nbsp; ' IF NOT ip.active %]
[% SET dns = ip.dns %]
[% IF dns %]

43
Netdisco/share/views/ajax/device/ports_csv.tt
View File

@@ -11,9 +11,9 @@
[% headers.push('Node MAC') %]
[% headers.push('Archived Node') %]
[% headers.push('Age Stamp') IF params.n_age %]
[% headers.push('Node IP') IF params.n_ip %]
[% headers.push('Node DNS') IF params.n_ip %]
[% headers.push('Archived IP') IF params.n_ip %]
[% headers.push('Node IP') IF params.n_ip4 OR params.n_ip6 %]
[% headers.push('Node DNS') IF params.n_ip4 OR params.n_ip6 %]
[% headers.push('Archived IP') IF params.n_ip4 OR params.n_ip6 %]
[% ELSIF item.name == 'c_duplex' %]
[% headers.push('Duplex Setting') %]
[% headers.push('Duplex') %]
@@ -132,9 +132,9 @@
[% myport.push('') %]
[% myport.push('') %]
[% myport.push('') IF params.n_age %]
[% myport.push('') IF params.n_ip %]
[% myport.push('') IF params.n_ip %]
[% myport.push('') IF params.n_ip %]
[% myport.push('') IF params.n_ip4 OR params.n_ip6 %]
[% myport.push('') IF params.n_ip4 OR params.n_ip6 %]
[% myport.push('') IF params.n_ip4 OR params.n_ip6 %]
[% END %]
[% IF params.c_neighbors %]
@@ -184,21 +184,36 @@
[% CALL mynode.push(node.time_last_age) IF params.n_age %]
[% IF params.n_ip %]
[% IF params.n_ip4 OR params.n_ip6 %]
[% mynode.push('') %]
[% mynode.push('') %]
[% mynode.push('') %]
[% SET has_ips = 0 %]
[% FOREACH ip IN node.ips %]
[% SET has_ips = 1 %]
[% IF params.n_ip4 %]
[% FOREACH ip IN node.ip4s %]
[% 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 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) %]
[% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %]
[% CSV.dump(myport) %]
[% 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 %]