mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-11-07 21:02:53 -05:00
add meshgroup to relay groups for clarification #6949
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
@@ -13280,7 +13280,7 @@
|
||||
x += '<div id=d2devrelaydiv style=display:none>';
|
||||
relayDevices.sort(nameSort);
|
||||
var relayDevices2 = [];
|
||||
for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + '</option>'); }
|
||||
for (var i in relayDevices) { relayDevices2.push('<option value="' + relayDevices[i]._id + '">' + EscapeHtml(relayDevices[i].name) + ' (' + EscapeHtml(relayDevices[i].meshnamel) + ')' + '</option>'); }
|
||||
x += addHtmlValue("Relay Device", '<div style=width:230px;margin:0;padding:0><select id=d2devrelay style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) >' + relayDevices2.join('') + '</select></div>');
|
||||
x += '</div>';
|
||||
}
|
||||
@@ -13559,7 +13559,7 @@
|
||||
if (((currentMesh.mtype == 3) || (currentMesh.mtype == 4)) && (currentMesh.relayid != null)) {
|
||||
var relayName = '<i>' + "Unknown" + '</i>';
|
||||
var relayNode = getNodeFromId(currentMesh.relayid);
|
||||
if (relayNode != null) { relayName = EscapeHtml(relayNode.name); }
|
||||
if (relayNode != null) { relayName = EscapeHtml(relayNode.name) + ' (' + EscapeHtml(relayNode.meshnamel) + ')'; }
|
||||
x += addHtmlValue("Relay Device", addLinkConditional(relayName, 'p20editmeshrelay()', (meshrights & 1) != 0));
|
||||
}
|
||||
|
||||
@@ -13976,7 +13976,7 @@
|
||||
setDialogMode(2, "Edit Device Group", 1, null, "No relay devices available.");
|
||||
} else {
|
||||
var relayDevices2 = [];
|
||||
for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + '</option>'); }
|
||||
for (var i in relayDevices) { relayDevices2.push('<option value="' + (relayDevices[i]._id + '"' + ((currentMesh.relayid == relayDevices[i]._id) ? ' selected' : '')) + '>' + EscapeHtml(relayDevices[i].name) + ' (' + EscapeHtml(relayDevices[i].meshnamel) + ')' + '</option>'); }
|
||||
var x = addHtmlValue("Relay Device", '<div style=width:230px;margin:0;padding:0><select id=d2devrelay style=width:100%>' + relayDevices2.join('') + '</select></div>');
|
||||
setDialogMode(2, "Edit Device Group", 3, p20editmeshrelayEx, x);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user