From 51a60d3d467cbe89e80eeda2670c79cc1dd8bbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 15 Oct 2020 16:07:25 -0400 Subject: [PATCH] fix: handler for group.join --- public/src/client/groups/memberlist.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/public/src/client/groups/memberlist.js b/public/src/client/groups/memberlist.js index 3952aab300..c4d02e33e1 100644 --- a/public/src/client/groups/memberlist.js +++ b/public/src/client/groups/memberlist.js @@ -66,10 +66,7 @@ define('forum/groups/memberlist', ['api'], function (api) { } function addUserToGroup(users, callback) { - function done(err) { - if (err) { - return app.alertError(err); - } + function done() { users = users.filter(function (user) { return !$('[component="groups/members"] [data-uid="' + user.uid + '"]').length; }); @@ -80,7 +77,12 @@ define('forum/groups/memberlist', ['api'], function (api) { } var uids = users.map(function (user) { return user.uid; }); if (groupName === 'administrators') { - socket.emit('admin.user.makeAdmins', uids, done); + socket.emit('admin.user.makeAdmins', uids, function (err) { + if (err) { + return app.alertError(err); + } + done(); + }); } else { Promise.all(uids.map(uid => api.put('/groups/' + ajaxify.data.group.slug + '/membership/' + uid))).then(done); }