From 8300aeec3529fbf45a9b37649393309970ab052a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 May 2015 13:55:40 -0400 Subject: [PATCH] parseInt member count, use getMemberCount in install js --- src/groups.js | 7 ++++++- src/install.js | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/groups.js b/src/groups.js index e6acafcd80..0c667c9871 100644 --- a/src/groups.js +++ b/src/groups.js @@ -363,7 +363,12 @@ var async = require('async'), }; 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) { diff --git a/src/install.js b/src/install.js index ed9616ffc3..9aafa5d598 100644 --- a/src/install.js +++ b/src/install.js @@ -294,8 +294,11 @@ function enableDefaultTheme(next) { function createAdministrator(next) { var Groups = require('./groups'); - Groups.get('administrators', {}, function (err, groupObj) { - if (!err && groupObj && groupObj.memberCount > 0) { + Groups.getMemberCount('administrators', function (err, memberCount) { + if (err) { + return next(err); + } + if (memberCount > 0) { process.stdout.write('Administrator found, skipping Admin setup\n'); next(); } else {