More user groups improvements.
Ylian Saint-Hilaire committed
Jan 6, 2020 at 11:54 UTC
fe1079d1f1cfe55fc6959376dd1b9464ca6071ac
3 files changed
+10
-2
public/scripts/meshcentral.js
+1
-1
@@ -53,7 +53,7 @@ var MeshServerCreateControl = function (domain, authCookie) {
53
54
obj.send = function (x) {
55
if (obj.socket != null && obj.connectstate == 1) {
56
- if (obj.trace) { console.log('SEND', x); }
56
+ if (obj.trace && (x.action != 'ping')) { console.log('SEND', x); }
57
obj.socket.send(JSON.stringify(x));
58
}
59
}
views/default-mobile.handlebars
+5
-1
@@ -915,6 +915,10 @@
915
ugroup.links = message.event.links;
916
}
917
//masterUpdate(8192 + 16384);
918
+
919
+ // Group update, refresh all our device groups and nodes. TODO: Optimize this to only do this when needed.
920
+ meshserver.send({ action: 'meshes' });
921
+ meshserver.send({ action: 'nodes' });
922
break;
923
}
924
case 'deleteusergroup': {
@@ -954,7 +958,7 @@
958
meshes[message.event.meshid].links = message.event.links;
959
960
// Check if we lost rights to this mesh in this change.
957
- if (meshes[message.event.meshid].links[userinfo._id] == null) {
961
+ if (IsMeshViewable(message.event.meshid) == false) {
962
if ((xxcurrentView == 20) && (currentMesh == meshes[message.event.meshid])) go(2);
963
delete meshes[message.event.meshid];
964
views/default.handlebars
+4
@@ -2238,6 +2238,10 @@
2238
if (message.event.links) { ugroup.links = message.event.links; } else { delete ugroup.links; }
2239
}
2240
masterUpdate(8192 + 16384);
2241
+
2242
+ // Group update, refresh all our device groups and nodes. TODO: Optimize this to only do this when needed.
2243
+ meshserver.send({ action: 'meshes' });
2244
+ meshserver.send({ action: 'nodes' });
2245
break;
2246
}
2247
case 'deleteusergroup': {