diff --git a/public/scripts/agent-rdp-0.0.1.js b/public/scripts/agent-rdp-0.0.1.js index 436d9aa8..77924360 100644 --- a/public/scripts/agent-rdp-0.0.1.js +++ b/public/scripts/agent-rdp-0.0.1.js @@ -104,13 +104,7 @@ var CreateRDPDesktop = function (canvasid) { if (obj.socket) { obj.socket.close(); } } - obj.m.setClipboard = function (content) { - console.log('s1'); - if (obj.socket) { - console.log('s2', content); - obj.socket.send(JSON.stringify(['clipboard', content])); - } - } + obj.m.setClipboard = function (content) { if (obj.socket) { obj.socket.send(JSON.stringify(['clipboard', content])); } } function changeState(newstate) { if (obj.State == newstate) return; diff --git a/views/default.handlebars b/views/default.handlebars index b62b6083..28cb6292 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -3178,6 +3178,9 @@ // Web page update mainUpdate(1 | 2 | 4 | 16); + // If we are looking at the device group for this device, update that. + if ((xxcurrentView == 20) && (currentMesh != null) && (currentMesh._id == node.meshid)) { mainUpdate(4096); } + break; } case 'removenode': { @@ -3194,6 +3197,9 @@ // Web page update mainUpdate(4 | 16); + + // If we are looking at the device group for this device, update that. + if ((xxcurrentView == 20) && (currentMesh != null) && (currentMesh._id == node.meshid)) { mainUpdate(4096); } } break; } @@ -12212,6 +12218,9 @@ x += ' ' + "Add Agent" + ''; x += ' ' + "Invite" + ''; } + if ((currentMesh.mtype == 3) && ((userinfo.siteadmin == 0xFFFFFFFF) || ((userinfo.siteadmin & 4096) == 0))) { + x += ' ' + "Add Device" + ''; + } if (currentMesh.amt && (currentMesh.amt.type > 2) && ((userinfo.siteadmin == 0xFFFFFFFF) || ((userinfo.siteadmin & 4096) == 0))) { // ACM activation or Full Automatic x += ' ' + "ACM" + ''; }