diff --git a/meshagent.js b/meshagent.js index 9faa97c6..c9e36460 100644 --- a/meshagent.js +++ b/meshagent.js @@ -1354,7 +1354,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) { // Event the node change var event = { etype: 'node', action: 'changenode', nodeid: obj.dbNodeKey, domain: domain.id }; if (changes.length > 0) { event.msg = 'Changed device ' + device.name + ' from group ' + mesh.name + ': ' + changes.join(', '); } - if ((log == 0) || (obj.agentInfo.capabilities & 0x20) || (changes.length == 0)) { event.nolog = 1; } // If this is a temporary device, don't log changes + if ((log == 0) || ((obj.agentInfo) && (obj.agentInfo.capabilities) && (obj.agentInfo.capabilities & 0x20)) || (changes.length == 0)) { event.nolog = 1; } // If this is a temporary device, don't log changes var device2 = common.Clone(device); if (device2.intelamt && device2.intelamt.pass) { delete device2.intelamt.pass; } // Remove the Intel AMT password before eventing this. event.node = device; diff --git a/package.json b/package.json index f27b5ffc..0b0c7aba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.7-p", + "version": "0.3.7-q", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index c33107c1..f4d7a6a5 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index a9f0f240..dea7559a 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -670,7 +670,7 @@   - + @@ -1521,8 +1521,8 @@ if (message.data == null) { setDialogMode(2, "MeshCentral Server Errors", 1, null, 'Server has no error log.'); } else { - var x = '
' + message.data + '
';
-                            setDialogMode(2, "MeshCentral Server Errors", 3, server_showErrorsDlgEx, x + '
');
+                            var x = '
' + message.data + '
';
+                            setDialogMode(2, "MeshCentral Server Errors", 3, server_showErrorsDlgEx, x + '
');
                             server_showVersionDlgUpdate();
                         }
                     }
@@ -2294,7 +2294,7 @@
                             if (view == 2) { r += '
'; }
                             r += '
';
                             r += '' + extra;
-                            r += '' + EscapeHtml(meshes[node.meshid].name) + '' + getMeshActions(mesh2, meshrights) + '
';
+                            r += '' + EscapeHtml(meshes[node.meshid].name) + '' + getMeshActions(mesh2, meshrights) + '
';
                             if (view == 2) { r += ''; }
                             current = node.meshid;
                             displayedMeshes[current] = 1;
@@ -6149,8 +6149,8 @@
 
             // We are allowed, let's prompt to information
             var x = "Create a new device group using the options below.

";
-            x += addHtmlValue('Name', '');
-            x += addHtmlValue('Type', '
');
+            x += addHtmlValue('Name', '');
+            x += addHtmlValue('Type', '
');
             x += addHtmlValue('Description', '
');
             setDialogMode(2, "New Device Group", 3, account_createMeshEx, x);
             account_validateMeshCreate();
@@ -6158,7 +6158,9 @@
             return false;
         }
 
-        function account_validateMeshCreate() {
+        function account_validateMeshCreate(e, x) {
+            if ((x == 1) && (e != null) && (e.key == "Enter") && (Q('dp2meshname').value.length > 0)) { Q('dp2meshtype').focus(); }
+            if ((x == 2) && (e != null) && (e.key == "Enter")) { Q('dp2meshdesc').focus(); }
             QE('idx_dlgOkButton', Q('dp2meshname').value.length > 0);
         }
 
@@ -6283,6 +6285,7 @@
         }
         function server_showErrorsDlgUpdate() { QE('idx_dlgOkButton', Q('d2updateCheck').checked); }
         function server_showErrorsDlgEx() { meshserver.send({ action: 'serverclearerrorlog' }); }
+        function d2CopyServerErrorsToClip() { saveAs(new Blob([Q('d2ServerErrorsLogPre').innerText], { type: "application/octet-stream" }), "servererrors.txt"); }
 
         //
         // MY MESHS
@@ -6372,21 +6375,6 @@
                 }
             }
 
-            /*
-            function getMeshActions(mesh, meshrights) {
-                if ((meshrights & 4) == 0) return '';
-                var r = '';
-                if (mesh.mtype == 1) {
-                    r += ' Add CIRA';
-                    r += ' Add Local';
-                }
-                if (mesh.mtype == 2) {
-                    r += ' Add Agent';
-                }
-                return r;
-            }
-            */
-
             x += '';
 
             // Sort the users for this mesh

User Authorizations