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

updating all group lib methods, and their callers -- #1252

Browse Source
This commit is contained in:
Julian Lam
2014-03-20 09:12:49 -04:00
parent befaa56ad0
commit 7b4f596aba
11 changed files with 107 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/install.js
View File

@@ -290,24 +290,14 @@ var async = require('async'),
function (next) {
// Check if an administrator needs to be created
var Groups = require('./groups');
Groups.getGidFromName('administrators', function (err, gid) {
if (err) {
return next(err.message);
}
if (gid) {
Groups.get(gid, {}, function (err, groupObj) {
if (groupObj.count > 0) {
winston.info('Administrator found, skipping Admin setup');
next();
} else {
install.createAdmin(next);
}
});
} else {
install.createAdmin(next);
}
Groups.get('administrators', {}, function (err, groupObj) {
if (groupObj.memberCount > 0) {
winston.info('Administrator found, skipping Admin setup');
next();
} else {
install.createAdmin(next);
}
});
});
},
function (next) {
@@ -417,7 +407,7 @@ var async = require('async'),
return callback(new Error('invalid-values'));
}
Groups.joinByGroupName('administrators', uid, callback);
Groups.join('administrators', uid, callback);
});
},
retryPassword = function (originalResults) {