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

format node mac based upon sidebar selection

Browse Source
This commit is contained in:
Eric A. Miller
2014-08-08 22:41:20 -04:00
parent 5baefd2879
commit 20d3383de0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -397,6 +397,7 @@ $(document).ready(function() {
} }
} }
[% IF params.c_nodes %] [% IF params.c_nodes %]
var macfmt = '[% params.mac_format %]';
for (index = 0; index < row.nodes.length; ++index) { for (index = 0; index < row.nodes.length; ++index) {
if ((row.remote_ip || row.is_uplink) && index === 0 ) { if ((row.remote_ip || row.is_uplink) && index === 0 ) {
cell_str = cell_str + '<br/>'; cell_str = cell_str + '<br/>';
@@ -419,8 +420,9 @@ $(document).ready(function() {
cell_str = cell_str + '<i class="icon-signal"></i>&nbsp;'; cell_str = cell_str + '<i class="icon-signal"></i>&nbsp;';
} }
cell_str = cell_str + '<a href="[% search_node %]&q='; cell_str = cell_str + '<a href="[% search_node %]&q=';
cell_str = cell_str + encodeURIComponent(row.nodes[index].mac) + '">'; var fmac = formatMacAddress(row.nodes[index].mac, macfmt);
cell_str = cell_str + he.encode(row.nodes[index].mac) + '</a>'; cell_str = cell_str + encodeURIComponent(fmac) + '">';
cell_str = cell_str + he.encode(fmac) + '</a>';
if (row.nodes[index].vlans.length > 0) { if (row.nodes[index].vlans.length > 0) {
var vl = row.nodes[index].vlans ? row.nodes[index].vlans.join(", ") : ""; var vl = row.nodes[index].vlans ? row.nodes[index].vlans.join(", ") : "";
cell_str = cell_str + ' (on vlan '; cell_str = cell_str + ' (on vlan ';