' + groups[i];
+ }
+ }
+
+ // If there is nothing to display, explain the problem
+ if (r == '') {
+ if ((Q('SearchInput').value == '') && (sort == 3)) {
+ r = '
No devices are included in any groups, click on a device\'s \"Groups\" to add to a group.
';
+ } else {
+ r = '
No devices matching this search.
';
+ }
+ }
+
if ((view == 1) && (c == 2)) r += '
'; // Adds device padding
// Display all empty meshes, we need to do this because users can add devices to these at any time.
@@ -1654,7 +1686,7 @@
multiDesktop[id] = desktop;
desktop = desktopNode = currentNode = null;
// Setup a replacement desktop
- QH('DeskParent', '');
+ QH('DeskParent', '');
} else {
// This is a new device, create a canvas for it.
var c = document.createElement('canvas');
@@ -1664,7 +1696,7 @@
c.setAttribute('oncontextmenu', 'return false');
c.setAttribute('style', 'background-color:black;width:' + vsize.x + 'px;height:' + vsize.y + 'px');
c.setAttribute('onclick', 'toggleKvmDevice(\'' + id + '\')');
- Q('xkvmid_' + shortid).appendChild(c);
+ try { Q('xkvmid_' + shortid).appendChild(c); } catch (ex) {}
// Check if we need to auto-connect
if (Q('autoConnectDesktopCheckbox').checked == true) { setTimeout(function() { connectMultiDesktop(node, 1); }, 100); }
}
@@ -2037,13 +2069,18 @@
setDialogMode(2, "Group Action", 3, groupActionFunctionEx, x);
}
+ // Get the list of checked devices, removes any duplicates.
+ function getCheckedDevices() {
+ var nodeids = [], elements = document.getElementsByClassName("DeviceCheckbox"), checkcount = 0;
+ for (var i in elements) { if (elements[i].checked) { if (elements[i].value) { var nid = elements[i].value.substring(6); if (nodeids.indexOf(nid) == -1) { nodeids.push(nid); } } } }
+ return nodeids;
+ }
+
function groupActionFunctionEx() {
var op = Q('d2groupop').value;
if (op == 100) {
// Group wake
- var nodeids = [], elements = document.getElementsByClassName("DeviceCheckbox"), checkcount = 0;
- for (var i in elements) { if (elements[i].checked) { nodeids.push(elements[i].value.substring(6)); } }
- meshserver.send({ action: 'wakedevices', nodeids: nodeids });
+ meshserver.send({ action: 'wakedevices', nodeids: getCheckedDevices() });
} else if (op == 101) {
// Group delete, ask for confirmation
var x = "Confirm delete selected devices(s)?
";
@@ -2052,19 +2089,12 @@
QE('idx_dlgOkButton', false);
} else {
// Power operation
- var nodeids = [], elements = document.getElementsByClassName("DeviceCheckbox"), checkcount = 0;
- for (var i in elements) { if (elements[i].checked) { nodeids.push(elements[i].value.substring(6)); } }
- meshserver.send({ action: 'poweraction', nodeids: nodeids, actiontype: op });
+ meshserver.send({ action: 'poweraction', nodeids: getCheckedDevices(), actiontype: op });
}
}
function d2groupActionFunctionDelEx() { QE('idx_dlgOkButton', Q('d2check').checked); }
-
- function groupActionFunctionDelEx() {
- var nodeids = [], elements = document.getElementsByClassName("DeviceCheckbox"), checkcount = 0;
- for (var i in elements) { if (elements[i].checked) { nodeids.push(elements[i].value.substring(6)); } }
- meshserver.send({ action: 'removedevices', nodeids: nodeids });
- }
+ function groupActionFunctionDelEx() { meshserver.send({ action: 'removedevices', nodeids: getCheckedDevices() }); }
function onSortSelectChange(skipsave) {
sort = document.getElementById("sortselect").selectedIndex;
@@ -2858,6 +2888,11 @@
x += addDeviceAttribute('Connectivity', cstate.join(', '));
}
+ // Node grouping tags
+ var groupingTags = 'None';
+ if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '' + node.tags[i] + ''; } }
+ x += addDeviceAttribute('Groups', '' + groupingTags + '');
+
x += ' ';
// Show action button, only show if we have permissions 4, 8, 64
if ((meshrights & 76) != 0) { x += ''; }
@@ -3233,14 +3268,16 @@
meshserver.send({ action: 'changedevice', nodeid: currentNode._id, icon: icon });
}
- var showEditNodeValueDialog_modes = ['Device Name', 'Hostname', 'Description'];
- var showEditNodeValueDialog_modes2 = ['name', 'host', 'desc'];
+ var showEditNodeValueDialog_modes = ['Device Name', 'Hostname', 'Description', 'Groups'];
+ var showEditNodeValueDialog_modes2 = ['name', 'host', 'desc', 'tags'];
+ var showEditNodeValueDialog_modes3 = ['', '', '', 'Group1, Group2, Group3'];
function showEditNodeValueDialog(mode) {
if (xxdialogMode) return;
- var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '');
+ var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '');
setDialogMode(2, "Edit Device", 3, showEditNodeValueDialogEx, x, mode);
var v = currentNode[showEditNodeValueDialog_modes2[mode]];
if (v == null) v = '';
+ if (Array.isArray(v)) { v = v.join(', '); }
Q('dp10devicevalue').value = v;
p10editdevicevalueValidate();
Q('dp10devicevalue').focus();