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

parseInt member count, use getMemberCount in install js

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-05-26 13:55:40 -04:00
parent 50d9a3f0a7
commit 8300aeec35
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/groups.js
View File

@@ -363,7 +363,12 @@ var async = require('async'),
}; };
Groups.getMemberCount = function(groupName, callback) { Groups.getMemberCount = function(groupName, callback) {
db.getObjectField('group:' + groupName, 'memberCount', callback); db.getObjectField('group:' + groupName, 'memberCount', function(err, count) {
if (err) {
return callback(err);
}
callback(null, parseInt(count, 10));
});
}; };
Groups.isMemberOfGroupList = function(uid, groupListKey, callback) { Groups.isMemberOfGroupList = function(uid, groupListKey, callback) {

7
src/install.js
View File

@@ -294,8 +294,11 @@ function enableDefaultTheme(next) {
function createAdministrator(next) { function createAdministrator(next) {
var Groups = require('./groups'); var Groups = require('./groups');
Groups.get('administrators', {}, function (err, groupObj) { Groups.getMemberCount('administrators', function (err, memberCount) {
if (!err && groupObj && groupObj.memberCount > 0) { if (err) {
return next(err);
}
if (memberCount > 0) {
process.stdout.write('Administrator found, skipping Admin setup\n'); process.stdout.write('Administrator found, skipping Admin setup\n');
next(); next();
} else { } else {