mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 16:46:12 +01:00
fix: handler for group.join
This commit is contained in:
@@ -66,10 +66,7 @@ define('forum/groups/memberlist', ['api'], function (api) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function addUserToGroup(users, callback) {
|
function addUserToGroup(users, callback) {
|
||||||
function done(err) {
|
function done() {
|
||||||
if (err) {
|
|
||||||
return app.alertError(err);
|
|
||||||
}
|
|
||||||
users = users.filter(function (user) {
|
users = users.filter(function (user) {
|
||||||
return !$('[component="groups/members"] [data-uid="' + user.uid + '"]').length;
|
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; });
|
var uids = users.map(function (user) { return user.uid; });
|
||||||
if (groupName === 'administrators') {
|
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 {
|
} else {
|
||||||
Promise.all(uids.map(uid => api.put('/groups/' + ajaxify.data.group.slug + '/membership/' + uid))).then(done);
|
Promise.all(uids.map(uid => api.put('/groups/' + ajaxify.data.group.slug + '/membership/' + uid))).then(done);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user