From 20d3383de0580d9a02313f6921aa928e1a2ae85d Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Fri, 8 Aug 2014 22:41:20 -0400 Subject: [PATCH] format node mac based upon sidebar selection --- Netdisco/share/views/ajax/device/ports.tt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt index 49bb0e72..cffc050e 100644 --- a/Netdisco/share/views/ajax/device/ports.tt +++ b/Netdisco/share/views/ajax/device/ports.tt @@ -397,6 +397,7 @@ $(document).ready(function() { } } [% IF params.c_nodes %] + var macfmt = '[% params.mac_format %]'; for (index = 0; index < row.nodes.length; ++index) { if ((row.remote_ip || row.is_uplink) && index === 0 ) { cell_str = cell_str + '
'; @@ -419,8 +420,9 @@ $(document).ready(function() { cell_str = cell_str + ' '; } cell_str = cell_str + ''; - cell_str = cell_str + he.encode(row.nodes[index].mac) + ''; + var fmac = formatMacAddress(row.nodes[index].mac, macfmt); + cell_str = cell_str + encodeURIComponent(fmac) + '">'; + cell_str = cell_str + he.encode(fmac) + ''; if (row.nodes[index].vlans.length > 0) { var vl = row.nodes[index].vlans ? row.nodes[index].vlans.join(", ") : ""; cell_str = cell_str + ' (on vlan ';