From d40a6a5c3f54d034395189b38e84cb30bf0ffdc6 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Mon, 30 Sep 2013 16:19:20 -0400 Subject: [PATCH 1/2] added adminitstrator value to userData for admin users page --- src/user.js | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/user.js b/src/user.js index ecbee2eb76..d32ee700dd 100644 --- a/src/user.js +++ b/src/user.js @@ -317,17 +317,23 @@ var utils = require('./../public/src/utils.js'), return callback(err, null); } - function iterator(uid, callback) { - User.getUserData(uid, function(err, userData) { - if (userData) { - data.push(userData); - } - callback(null); - }); - } + Groups.getGidFromName('Administrators', function(err, gid) { - async.eachSeries(uids, iterator, function(err) { - callback(err, data); + function iterator(uid, callback) { + User.getUserData(uid, function(err, userData) { + Groups.isMember(uid, gid, function(err, isMember) { + if (userData) { + userData.administrator = isMember; + data.push(userData); + } + callback(null); + }); + }); + } + + async.eachSeries(uids, iterator, function(err) { + callback(err, data); + }); }); }); } From e78369f0facf18839dcdbed404e6b914ba093ffb Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Mon, 30 Sep 2013 16:24:00 -0400 Subject: [PATCH 2/2] use User.isAdmin instead --- src/user.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/user.js b/src/user.js index d32ee700dd..bbe6779303 100644 --- a/src/user.js +++ b/src/user.js @@ -317,25 +317,23 @@ var utils = require('./../public/src/utils.js'), return callback(err, null); } - Groups.getGidFromName('Administrators', function(err, gid) { - - function iterator(uid, callback) { - User.getUserData(uid, function(err, userData) { - Groups.isMember(uid, gid, function(err, isMember) { - if (userData) { - userData.administrator = isMember; - data.push(userData); - } - callback(null); - }); + function iterator(uid, callback) { + User.getUserData(uid, function(err, userData) { + User.isAdministrator(uid, function(isAdmin) { + if (userData) { + userData.administrator = isAdmin?"1":"0"; + data.push(userData); + } + callback(null); }); - } - - async.eachSeries(uids, iterator, function(err) { - callback(err, data); }); + } + + async.eachSeries(uids, iterator, function(err) { + callback(err, data); }); }); + } User.createGravatarURLFromEmail = function(email) {