Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

issue #961 - fixed bug where if a moderators group was not found, it would cause the active users box to derp out. Also renamed the moderators priv group name

Browse Source
This commit is contained in:
Julian Lam
2014-02-07 12:10:46 -05:00
parent e176abae50
commit f8ea87b003
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/categories.js
View File

@@ -187,7 +187,7 @@ var db = require('./database'),
}; };
Categories.getModerators = function(cid, callback) { Categories.getModerators = function(cid, callback) {
Groups.getByGroupName('cid:' + cid + ':moderators', {}, function(err, groupObj) { Groups.getByGroupName('cid:' + cid + ':privileges:mod', {}, function(err, groupObj) {
if (!err) { if (!err) {
if (groupObj.members && groupObj.members.length) { if (groupObj.members && groupObj.members.length) {
user.getMultipleUserFields(groupObj.members, ['uid', 'username', 'userslug', 'picture'], function(err, moderators) { user.getMultipleUserFields(groupObj.members, ['uid', 'username', 'userslug', 'picture'], function(err, moderators) {
@@ -197,7 +197,8 @@ var db = require('./database'),
callback(null, []); callback(null, []);
} }
} else { } else {
callback(err, null); // Probably no mods
callback(null, []);
} }
}); });
}; };

2
src/user.js
View File

@@ -753,7 +753,7 @@ var bcrypt = require('bcryptjs'),
}; };
User.isModerator = function(uid, cid, callback) { User.isModerator = function(uid, cid, callback) {
groups.isMemberByGroupName(uid, 'cid:' + cid + ':moderators', function(err, isMember) { groups.isMemberByGroupName(uid, 'cid:' + cid + ':privileges:mod', function(err, isMember) {
if(err) { if(err) {
return calback(err); return calback(err);
} }