Fix for: Collapse all when using view Group-Tags #3765
Ylian Saint-Hilaire committed
Mar 15, 2022 at 14:31 UTC
4252205b7425e908ddbbca09200091532c258898
2 files changed
+8
-9
views/default.handlebars
+7
-8
@@ -5975,13 +5975,12 @@
5975
CollapsedGroups = {};
5976
for (var i in nodes) {
5977
var node = nodes[i];
5978
- if (node.tags) {
5979
- var mesh2 = meshes[node.meshid];
5980
- if (mesh2) {
5981
- for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx(mesh2.name + ' - ' + node.tags[j])] = true; }
5982
- } else {
5983
- for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx('**INDV*~*DEVS** - ' + node.tags[j])] = true; }
5984
- }
5978
+ var mesh2 = meshes[node.meshid];
5979
+ if (mesh2) {
5980
+ CollapsedGroups['tag:' + encodeURIComponentEx(mesh2.name)] = true;
5981
+ if (node.tags) { for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx(mesh2.name + ' - ' + node.tags[j])] = true; } }
5982
+ } else {
5983
+ if (node.tags) { for (var j in node.tags) { CollapsedGroups['tag:' + encodeURIComponentEx('**INDV*~*DEVS** - ' + node.tags[j])] = true; } }
5984
}
5985
}
5986
}
@@ -8404,7 +8403,7 @@
8403
};
8404
desktop.Start(desktopNode._id, 16994, '*', '*', 0);
8405
desktop.contype = 2;
8407
- } else if ((contype == null) || (contype == 1) || ((contype == 3) && (currentNode.agent.id > 4))) {
8406
+ } else if ((contype == null) || (contype == 1) || ((contype == 3) && (currentNode.agent.id > 4) && (debugmode != null))) {
8407
// Setup the Mesh Agent remote desktop
8408
desktop = CreateAgentRedirect(meshserver, CreateAgentRemoteDesktop('Desk'), serverPublicNamePort, authCookie, authRelayCookie, domainUrl);
8409
desktop.m.UseExtendedKeyFlag = (desktopNode.agent.id < 5); // Only use extended keys on Windows agents for now
webserver.js
+1
-1
@@ -1776,7 +1776,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
1776
} else {
1777
// Check is email already exists
1778
obj.db.GetUserWithVerifiedEmail(domain.id, email, function (err, docs) {
1779
- if ((err != null) || (docs.length > 0 && docs.find(u => u._id === req.session.cuserid) < 0)) {
1779
+ if ((err != null) || ((docs.length > 0) && (docs.find(function (u) { return (u._id === req.session.cuserid); }) < 0))) {
1780
// Email already exitst
1781
req.session.messageid = 102; // Existing account with this email address.
1782
} else {