Merge branch 'release' into develop

2018-06-29 00:22:18 +00:00
parent d9b573b430 217c16988b
commit d8925a8811
25 changed files with 124 additions and 112 deletions
@@ -588,7 +588,8 @@ api.joinGroup = {
    }
    if (!isUserInvited) throw new NotAuthorized(res.t('messageGroupRequiresInvite'));

-    if (group.memberCount === 0) group.leader = user._id; // If new user is only member -> set as leader
+    // @TODO: Review the need for this and if still needed, don't base this on memberCount
+    if (!group.hasNotCancelled() && group.memberCount === 0) group.leader = user._id; // If new user is only member -> set as leader

    if (group.hasNotCancelled())  {
      await payments.addSubToGroupUser(user, group);