Fixed for #2424
Ylian Saint-Hilaire committed
Mar 26, 2021 at 23:33 UTC
b753c10dbef6bce4183edf433d96ff68ca2c38f2
1 file changed
+3
-4
views/default.handlebars
+3
-4
@@ -2693,7 +2693,7 @@
2693
case 'accountcreate':
2694
case 'accountchange': {
2695
// An account was created or changed
2696
- if ((typeof message.event.account != 'object') || (message.event.account == null)) console.log(message.event); return;
2696
+ if ((typeof message.event.account != 'object') || (message.event.account == null)) { console.log(message.event); return; }
2697
if (userinfo._id == message.event.account._id) {
2698
var newsiteadmin = message.event.account.siteadmin?message.event.account.siteadmin:0;
2699
var oldsiteadmin = userinfo.siteadmin?userinfo.siteadmin:0;
@@ -4091,8 +4091,7 @@
4091
4092
// Return HTML with a list of MeshCentral Router links
4093
function getShortRouterLinks(node) {
4094
- var x = '';
4095
- var meshrights = GetNodeRights(node);
4094
+ var x = '', meshrights = GetNodeRights(node);
4095
4096
// RDP link, show this link only of the remote machine is Windows.
4097
if (((node.conn & 1) != 0) && (node.agent) && ((meshrights & 8) != 0) && (node.agent.id != 14)) {
@@ -4119,7 +4118,7 @@
4118
if ((serverinfo.devicemeshrouterlinks != null) && (Array.isArray(serverinfo.devicemeshrouterlinks.extralinks))) {
4119
for (var i in serverinfo.devicemeshrouterlinks.extralinks) {
4120
var r = serverinfo.devicemeshrouterlinks.extralinks[i], p = 0;
4122
- if ((r.filter == null) || (Array.isArray(r.filter) && ((r.filter.indexOf(mesh._id) >= 0) || (r.filter.indexOf(node._id) >= 0)))) {
4121
+ if ((r.filter == null) || (Array.isArray(r.filter) && ((r.filter.indexOf(node.meshid) >= 0) || (r.filter.indexOf(node._id) >= 0)))) {
4122
if (typeof r.protocol == 'number') { p = r.protocol; } else if (r.protocol == 'http') { p = 1; } else if (r.protocol == 'https') { p = 2; } else if (r.protocol == 'rdp') { p = 3; } else if (r.protocol == 'ssh') { p = 4; } else if (r.protocol == 'scp') { p = 5; }
4123
x += '<a href=# onclick=p10MCRouter("' + node._id + '",' + p + ',' + r.port + (r.ip?(',\"' + r.ip + '\"'):'') + ')>' + r.name + '</a> ';
4124
}