From 36d9d13234ab5bc21aec42091bf16fb8c9c9fad2 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 20 Apr 2021 20:38:10 -0700
Subject: [PATCH] Fix for #2522.

---
 meshuser.js              | 2 +-
 views/default.handlebars | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meshuser.js b/meshuser.js
index a8f17f05..5a9c8885 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -2491,7 +2491,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         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; }
                         if (change != '') {
                             db.Set(group);
-                            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 };
+                            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 };
                             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.
                             parent.parent.DispatchEvent(['*', group._id, user._id], obj, event);
                         }
diff --git a/views/default.handlebars b/views/default.handlebars
index e155e18c..b0cf7f0f 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2762,7 +2762,7 @@
                                 ugroup.name = message.event.name;
                                 if (message.event.desc) { ugroup.desc = message.event.desc; } else { delete ugroup.desc; }
                                 if (message.event.links) { ugroup.links = message.event.links; } else { delete ugroup.links; }
-                                if (message.event.consent) { ugroup.consent = message.event.consent; } else { delete ugroup.consent; }
+                                if (message.event.consent !== null) { ugroup.consent = message.event.consent; }
                             }
                             mainUpdate(4096 + 8192 + 16384);