mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2025-10-26 11:27:04 +00:00
Merge 50b62c7c8a into c899ee2404
This commit is contained in:
commit
f80752af24
@ -1385,6 +1385,11 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
|
||||
case 'pong': { break; }
|
||||
case 'getScript':
|
||||
{
|
||||
if (typeof parent.getCiraConfigurationScript !== 'function' || typeof parent.getCiraCleanupScript !== 'function') {
|
||||
obj.send('Function deprecated.');
|
||||
break;
|
||||
}
|
||||
|
||||
// Used by the agent to get configuration scripts.
|
||||
if (command.type == 1) {
|
||||
parent.getCiraConfigurationScript(obj.dbMeshKey, function (script) {
|
||||
|
||||
@ -8406,19 +8406,20 @@
|
||||
|
||||
// Add node name
|
||||
var nname = EscapeHtml(node.name), nnameEx;
|
||||
var only_nname = nname;
|
||||
if (nname.length == 0) { nname = '<i>' + "None" + '</i>'; }
|
||||
if (((meshrights & 4) != 0) && ((!mesh.flags) || ((mesh.flags & 2) == 0 || (mesh.flags & 16)))) { nname = '<span tabindex=0 title="' + "Click here to edit the server-side device name" + '" onclick=showEditNodeValueDialog(0) onkeyup="if (event.key == \'Enter\') showEditNodeValueDialog(0)" role="button">' + nname + ' <i class="fa-solid fa-pencil fa-2xs"/></i></span>'; }
|
||||
nnameEx = nname;
|
||||
if (mesh) { nname += '<span style=color:#AAA;font-size:small> - ' + EscapeHtml(mesh.name) + '</span>'; }
|
||||
QH('p10deviceName', nname);
|
||||
QH('p11deviceName', nname);
|
||||
QH('p12deviceName', nname);
|
||||
QH('p13deviceName', nname);
|
||||
QH('p14deviceName', nname);
|
||||
QH('p15deviceName', "Console - " + nname);
|
||||
QH('p16deviceName', nname);
|
||||
QH('p17deviceName', nname);
|
||||
QH('p19deviceName', nname);
|
||||
QH('p11deviceName', only_nname);
|
||||
QH('p12deviceName', only_nname);
|
||||
QH('p13deviceName', only_nname);
|
||||
QH('p14deviceName', only_nname);
|
||||
QH('p15deviceName', "Console - " + only_nname);
|
||||
QH('p16deviceName', only_nname);
|
||||
QH('p17deviceName', only_nname);
|
||||
QH('p19deviceName', only_nname);
|
||||
|
||||
// Node attributes
|
||||
var x = '<table style=width:100%>';
|
||||
@ -16098,7 +16099,6 @@
|
||||
// Add device group name
|
||||
var meshrights = GetMeshRights(currentMesh), mname = EscapeHtml(currentMesh.name);
|
||||
if (mname.length == 0) { mname = '<i>' + "None" + '</i>'; }
|
||||
if ((meshrights & 1) != 0) { mname = '<span tabindex=0 title="' + "Click here to edit the device group name" + '" onclick=p20editmesh(1) onkeyup="if (event.key == \'Enter\') p20editmesh(1)" role=button>' + mname + ' <i class="fa-solid fa-pencil fa-2xs"></i></span>'; }
|
||||
QH('p21meshName', mname);
|
||||
|
||||
// Update charts
|
||||
|
||||
Loading…
Reference in New Issue
Block a user