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

removed old code that was no longer necessary, updated privilege table to show all groups (similar to previous behaviour), fixes #2887

Browse Source
This commit is contained in:
Julian Lam
2015-03-25 16:09:38 -04:00
parent 9b84a887d3
commit d3af278123
3 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/groups.js
View File

@@ -47,6 +47,7 @@ var async = require('async'),
getEphemeralGroup: function(groupName) { getEphemeralGroup: function(groupName) {
return { return {
name: groupName, name: groupName,
slug: utils.slugify(groupName),
description: '', description: '',
deleted: '0', deleted: '0',
hidden: '0', hidden: '0',

34
src/privileges/categories.js
View File

@@ -82,29 +82,25 @@ module.exports = function(privileges) {
}), next); }), next);
}, },
function(memberSets, next) { function(memberSets, next) {
// Reduce into a single array groups.list({
var members = memberSets.reduce(function(combined, curMembers) { expand: false,
return combined.concat(curMembers); isAdmin: true,
}).filter(function(member, index, combined) { showSystemGroups: true
return combined.indexOf(member) === index; }, function(err, memberData) {
}); memberData = memberData.filter(function(member) {
return member.name.indexOf(':privileges:') === -1;
// Special handling for "guests" group }).map(function(member) {
members.splice(members.indexOf('guests'), 1);
groups.getMultipleGroupFields(members, ['name', 'slug', 'memberCount'], function(err, memberData) {
memberData.push({
name: 'guests',
slug: 'guests'
});
memberData = memberData.map(function(member) {
member.privileges = {}; member.privileges = {};
for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) { for(var x=0,numPrivs=privileges.length;x<numPrivs;x++) {
member.privileges[privileges[x]] = memberSets[x].indexOf(member.name) !== -1 member.privileges[privileges[x]] = memberSets[x].indexOf(member.slug) !== -1
} }
return member; return {
name: member.name,
slug: member.slug,
memberCount: member.memberCount,
privileges: member.privileges,
};
}); });
next(null, memberData); next(null, memberData);

42
src/socket.io/admin/categories.js
View File

@@ -66,46 +66,4 @@ Categories.getPrivilegeSettings = function(socket, cid, callback) {
privileges.categories.list(cid, callback); privileges.categories.list(cid, callback);
}; };
// Categories.setGroupPrivilege = function(socket, data, callback) {
// if(!data) {
// return callback(new Error('[[error:invalid-data]]'));
// }
// groups[data.set ? 'join' : 'leave']('cid:' + data.cid + ':privileges:' + data.privilege, data.name, function (err) {
// if (err) {
// return callback(err);
// }
// groups.hide('cid:' + data.cid + ':privileges:' + data.privilege, callback);
// });
// };
// Categories.groupsList = function(socket, cid, callback) {
// groups.list({
// expand: false,
// isAdmin: true,
// showSystemGroups: true
// }, function(err, data) {
// if(err) {
// return callback(err);
// }
// // Remove privilege groups
// data = data.filter(function(groupObj) {
// return groupObj.name.indexOf(':privileges:') === -1;
// });
// async.map(data, function(groupObj, next) {
// privileges.categories.groupPrivileges(cid, groupObj.name, function(err, privileges) {
// if(err) {
// return next(err);
// }
// groupObj.privileges = privileges;
// next(null, groupObj);
// });
// }, callback);
// });
// };
module.exports = Categories; module.exports = Categories;