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

removed unused function from groups, jshint

Browse Source
This commit is contained in:
barisusakli
2014-03-09 23:51:09 -04:00
parent 16d2e65ea0
commit b413f06b72
1 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/groups.js
View File

@@ -1,7 +1,9 @@
'use strict';
(function(Groups) { (function(Groups) {
"use strict";
var async = require('async'), var async = require('async'),
winston = require('winston'),
user = require('./user'), user = require('./user'),
db = require('./database'); db = require('./database');
@@ -34,7 +36,7 @@
async.map(systemGroups, function(groupName, next) { async.map(systemGroups, function(groupName, next) {
Groups.getByGroupName(groupName, options, function(err, groupObj) { Groups.getByGroupName(groupName, options, function(err, groupObj) {
groupObj['name'] = humanNames[systemGroups.indexOf(groupObj['name'])]; groupObj.name = humanNames[systemGroups.indexOf(groupObj.name)];
next(err, groupObj); next(err, groupObj);
}); });
}, callback); }, callback);
@@ -52,11 +54,8 @@
return next(err); return next(err);
} }
async.map(uids, function (uid, next) { async.map(uids, user.getUserData, next);
user.getUserData(uid, next);
}, function (err, users) {
next(err, users);
});
} else { } else {
next(err, uids); next(err, uids);
} }
@@ -155,7 +154,7 @@
callback(null, result); callback(null, result);
}); });
}); });
}) });
}; };
Groups.isEmpty = function(gid, callback) { Groups.isEmpty = function(gid, callback) {
@@ -230,16 +229,16 @@
db.exists('gid:' + gid, function (err, exists) { db.exists('gid:' + gid, function (err, exists) {
if (!err && exists) { if (!err && exists) {
// If the group was renamed, check for dupes, fix the assoc. hash // If the group was renamed, check for dupes, fix the assoc. hash
if (values['name']) { if (values.name) {
Groups.exists(values['name'], function(err, exists) { Groups.exists(values.name, function(err, exists) {
if (!exists) { if (!exists) {
Groups.get(gid, {}, function(err, groupObj) { Groups.get(gid, {}, function(err, groupObj) {
if (err) { if (err) {
return callback(new Error('group-not-found')); return callback(new Error('group-not-found'));
} }
db.deleteObjectField('group:gid', groupObj['name']); db.deleteObjectField('group:gid', groupObj.name);
db.setObjectField('group:gid', values['name'], gid); db.setObjectField('group:gid', values.name, gid);
db.setObject('gid:' + gid, values, callback); db.setObject('gid:' + gid, values, callback);
}); });
} else { } else {
@@ -332,40 +331,4 @@
}); });
}; };
Groups.getCategoryAccess = function(cid, uid, callback){
var access = false;
// check user group read access level
async.series([function(callback){
// get groups with read permission
db.getObjectField('group:gid', 'cid:' + cid + ':privileges:g+r', function(err, gid){
// get the user groups that belong to this read group
db.getSetMembers('gid:' + gid + ':members', function (err, gids) {
// check if user belong to any of these user groups
var groups_check = new Array();
gids.forEach(function(cgid){
groups_check.push(function(callback){
Groups.isMember(uid, cgid, function(err, isMember){
if (isMember){
access = true;
}
callback(null, gids);
})
});
});
// do a series check. We want to make sure we check all the groups before determining if the user
// has access or not.
async.series(groups_check, function(err, results){
callback(null, results);
});
});
});
}],
function(err, results){
// if the read group is empty we will asume that read access has been granted to ALL
if (results[0].length == 0){ access = true; }
callback(false, access);
});
};
}(module.exports)); }(module.exports));