Fix for #2522.
Ylian Saint-Hilaire committed
Apr 20, 2021 at 20:38 UTC
36d9d13234ab5bc21aec42091bf16fb8c9c9fad2
2 files changed
+2
-2
meshuser.js
+1
-1
@@ -2491,7 +2491,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2491
if ((typeof command.consent == 'number') && (command.consent != group.consent)) { if (change != '') change += ' and consent changed'; else change += 'User group "' + group.name + '" consent changed'; group.consent = command.consent; }
2492
if (change != '') {
2493
db.Set(group);
2494
- var event = { etype: 'ugrp', userid: user._id, username: user.name, ugrpid: group._id, name: group.name, desc: group.desc, consent: group.consent, action: 'usergroupchange', links: group.links, msg: change, domain: domain.id };
2494
+ var event = { etype: 'ugrp', userid: user._id, username: user.name, ugrpid: group._id, name: group.name, desc: group.desc, consent: ((group.consent == null) ? 0 : group.consent), action: 'usergroupchange', links: group.links, msg: change, domain: domain.id };
2495
if (db.changeStream) { event.noact = 1; } // If DB change stream is active, don't use this event to change the mesh. Another event will come.
2496
parent.parent.DispatchEvent(['*', group._id, user._id], obj, event);
2497
}
views/default.handlebars
+1
-1
@@ -2762,7 +2762,7 @@
2762
ugroup.name = message.event.name;
2763
if (message.event.desc) { ugroup.desc = message.event.desc; } else { delete ugroup.desc; }
2764
if (message.event.links) { ugroup.links = message.event.links; } else { delete ugroup.links; }
2765
- if (message.event.consent) { ugroup.consent = message.event.consent; } else { delete ugroup.consent; }
2765
+ if (message.event.consent !== null) { ugroup.consent = message.event.consent; }
2766
}
2767
mainUpdate(4096 + 8192 + 16384);
2768