Merge pull request #828 from BitBangersCode/admin-group-fix

Admin group fix
v1.18.x
Barış Soner Uşaklı 11 years ago
commit c709fae251

@ -2,7 +2,8 @@ define(function() {
var Groups = {};
Groups.init = function() {
var createEl = document.getElementById('create'),
var yourid = templates.get('yourid'),
createEl = document.getElementById('create'),
createModal = $('#create-modal'),
createSubmitBtn = document.getElementById('create-modal-go'),
createNameEl = $('#create-group-name'),
@ -171,15 +172,23 @@ define(function() {
groupMembersEl.on('click', 'li[data-uid]', function() {
var uid = this.getAttribute('data-uid'),
gid = detailsModal.attr('data-gid');
bootbox.confirm('Are you sure you want to remove this user?', function(confirm) {
if (confirm){
socket.emit('admin.groups.leave', {
gid: gid,
uid: uid
}, function(err, data) {
if (!err) {
groupMembersEl.find('li[data-uid="' + uid + '"]').remove();
socket.emit('admin.groups.get', gid, function(err, groupObj){
if (!err){
if (groupObj.name == 'Administrators' && uid == yourid){
bootbox.alert('You cannot remove yourself from the Administrator Group');
return;
}
bootbox.confirm('Are you sure you want to remove this user?', function(confirm) {
if (confirm){
socket.emit('admin.groups.leave', {
gid: gid,
uid: uid
}, function(err, data) {
if (!err) {
groupMembersEl.find('li[data-uid="' + uid + '"]').remove();
}
});
}
});
}
@ -210,4 +219,4 @@ define(function() {
};
return Groups;
});
});

@ -95,4 +95,5 @@
</div>
</div>
</div>
</div>
</div>
<input type="hidden" template-variable="yourid" value="{yourid}" />

@ -429,7 +429,8 @@ var nconf = require('nconf'),
expand: true
}, function (err, groups) {
res.json(200, {
groups: groups
groups: groups,
yourid: req.user.uid
});
});
});

Loading…
Cancel
Save