diff --git a/src/controllers/admin.js b/src/controllers/admin.js index 6dc344a9b0..24332866f9 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -136,8 +136,6 @@ adminController.categories.get = function(req, res, next) { return next(err); } - data.privileges.columnCount = data.privileges.labels.users.length + 2; - res.render('admin/manage/category', { category: data.category[0], privileges: data.privileges diff --git a/src/privileges/categories.js b/src/privileges/categories.js index ff92f2b4d1..8591a174c4 100644 --- a/src/privileges/categories.js +++ b/src/privileges/categories.js @@ -44,7 +44,17 @@ module.exports = function(privileges) { privileges = privs; groups.getMembersOfGroups(privs.map(function(privilege) { return 'cid:' + cid + ':privileges:' + privilege; - }), next); + }), function(err, memberSets) { + if (err) { + return next(err); + } + + next(null, memberSets.map(function(set) { + return set.map(function(uid) { + return parseInt(uid, 10); + }); + })); + }); }, function(memberSets, next) { // Reduce into a single array @@ -58,7 +68,7 @@ module.exports = function(privileges) { memberData = memberData.map(function(member) { member.privileges = {}; for(var x=0,numPrivs=privileges.length;x