Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 08:55:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closed #2641

Browse Source
This commit is contained in:
Julian Lam
2015-01-22 14:19:59 -05:00
parent 740c52fc4f
commit d2217b8137
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en_GB/error.json
View File

@@ -66,6 +66,7 @@
"group-already-exists": "Group already exists", "group-already-exists": "Group already exists",
"group-name-change-not-allowed": "Group name change not allowed", "group-name-change-not-allowed": "Group name change not allowed",
"group-already-member": "You are already part of this group", "group-already-member": "You are already part of this group",
"group-needs-owner": "This group requires at least one owner",
"post-already-deleted": "This post has already been deleted", "post-already-deleted": "This post has already been deleted",
"post-already-restored": "This post has already been restored", "post-already-restored": "This post has already been restored",

2
public/src/client/groups/details.js
View File

@@ -34,7 +34,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker',
if (!err) { if (!err) {
ownerFlagEl.toggleClass('invisible'); ownerFlagEl.toggleClass('invisible');
} else { } else {
app.alertError(err); app.alertError(err.message);
} }
}); });
break; break;

21
src/groups.js
View File

@@ -659,8 +659,8 @@ var async = require('async'),
Groups.requestMembership = function(groupName, uid, callback) { Groups.requestMembership = function(groupName, uid, callback) {
async.parallel({ async.parallel({
exists: async.apply(Groups.isMember, uid, groupName), exists: async.apply(Groups.exists, groupName),
isMember: async.apply(Groups.exists, groupName) isMember: async.apply(Groups.isMember, uid, groupName)
}, function(err, checks) { }, function(err, checks) {
if (!checks.exists) { if (!checks.exists) {
return callback(new Error('[[error:no-group]]')); return callback(new Error('[[error:no-group]]'));
@@ -694,7 +694,12 @@ var async = require('async'),
Groups.leave = function(groupName, uid, callback) { Groups.leave = function(groupName, uid, callback) {
callback = callback || function() {}; callback = callback || function() {};
db.sortedSetRemove('group:' + groupName + ':members', uid, function(err) { var tasks = [
async.apply(db.sortedSetRemove, 'group:' + groupName + ':members', uid),
async.apply(db.setRemove, 'group:' + groupName + ':owners', uid)
];
async.parallel(tasks, function(err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -891,7 +896,15 @@ var async = require('async'),
Groups.ownership.rescind = function(toUid, groupName, callback) { Groups.ownership.rescind = function(toUid, groupName, callback) {
// Note: No ownership checking is done here on purpose! // Note: No ownership checking is done here on purpose!
db.setRemove('group:' + groupName + ':owners', toUid, callback);
// If the owners set only contains one member, error out!
db.setCount('group:' + groupName + ':owners', function(err, numOwners) {
if (numOwners <= 1) {
return callback(new Error('[[error:group-needs-owner]]'));
}
db.setRemove('group:' + groupName + ':owners', toUid, callback);
});
}; };
Groups.search = function(query, options, callback) { Groups.search = function(query, options, callback) {