external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-14 12:01:52 +00:00
Code Issues Releases Wiki Activity

Added meshid and group name to meshctrl.js listdevice json. #2933

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-27 10:47:41 -07:00
parent e8659b0d9e
commit 51a0b3c137
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
meshctrl.js
View file

@ -1872,7 +1872,7 @@ function serverConnect() {
if ((data.result != null) && (data.result != 'ok')) { if ((data.result != null) && (data.result != 'ok')) {
console.log(data.result); console.log(data.result);
} else { } else {
// Filder devices based on device id. // Filter devices based on device id.
if (args.filterid) { if (args.filterid) {
var filteridSplit = args.filterid.split(','), filters = []; var filteridSplit = args.filterid.split(','), filters = [];
for (var i in filteridSplit) { for (var i in filteridSplit) {
@ -1914,7 +1914,16 @@ function serverConnect() {
} else if (args.json) { } else if (args.json) {
// Return all devices in JSON format // Return all devices in JSON format
var nodes = []; var nodes = [];
for (var i in data.nodes) { var devicesInMesh = data.nodes[i]; for (var j in devicesInMesh) { nodes.push(devicesInMesh[j]); } }
for (var i in data.nodes) {
const devicesInMesh = data.nodes[i];
for (var j in devicesInMesh) {
devicesInMesh[j].meshid = i; // Add device group id
if (settings.xmeshes && settings.xmeshes[i] && settings.xmeshes[i].name) { devicesInMesh[j].groupname = settings.xmeshes[i].name; } // Add device group name
nodes.push(devicesInMesh[j]);
}
}
console.log(JSON.stringify(nodes, ' ', 2)); console.log(JSON.stringify(nodes, ' ', 2));
} else { } else {
// Display the list of nodes in text format // Display the list of nodes in text format