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

#442 add device ip, port and vlan to the node vendor report results

Browse Source
This commit is contained in:
Oliver Gorwits
2020-02-13 15:36:45 +00:00
parent 8b42fb3774
commit 654799e825
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
share/views/ajax/report/nodevendor.tt
View File

@@ -5,10 +5,9 @@
<tr>
<th>MAC</th>
<th>Vendor</th>
<th>Device (Port)</th>
<th>Device DNS</th>
<th>Device Name</th>
<th>Device IP</th>
<th>Device (IP)</th>
<th>Port</th>
<th>VLAN</th>
</tr>
</thead>
</table>
@@ -46,22 +45,20 @@ $(document).ready(function() {
return '<a href="[% uri_for('/report/nodevendor') | none %]?vendor=' + encodeURIComponent(row.oui.abbrev || 'blank') + '">' + he.encode(row.oui.company ||'(Unknown Vendor)') + '</a>';
}
}, {
"data": 'port',
"data": 'switch',
"render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on">' + he.encode(row.device.dns || row.device.name || row.switch) + '(' + he.encode(data) + ')</a>';
return '<a href="[% uri_for('/device') | none %]?q=' + encodeURIComponent(data) + '">' + he.encode(row.device.dns || row.device.name || data) + ' (' + he.encode(data) + ')</a>';
}
}, {
// Included for filtering
"data": 'device.dns',
"visible": false
"data": 'port',
"render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on&prefer=port">' + he.encode(data) + '</a>';
}
}, {
// Included for filtering
"data": 'device.name',
"visible": false
}, {
// Included for filtering
"data": 'switch',
"visible": false
"data": 'vlan',
"render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.switch) + '&f=' + encodeURIComponent(data) + '&c_nodes=on&n_ssid=on&prefer=vlan">' + he.encode(data) + '</a>';
}
}
],
[% ELSE %]