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

group null and err check

Browse Source
This commit is contained in:
barisusakli
2014-07-31 08:01:11 -04:00
parent dc68dce27f
commit d9a0af712d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/groups.js
View File

@@ -16,6 +16,9 @@
// Remove system, hidden, or deleted groups from this list // Remove system, hidden, or deleted groups from this list
if (groups && !options.showAllGroups) { if (groups && !options.showAllGroups) {
return groups.filter(function (group) { return groups.filter(function (group) {
if (!group) {
return false;
}
if (group.deleted || (group.hidden && !group.system) || (!options.showSystemGroups && group.system)) { if (group.deleted || (group.hidden && !group.system) || (!options.showSystemGroups && group.system)) {
return false; return false;
} else if (options.removeEphemeralGroups && ephemeralGroups.indexOf(group.name) !== -1) { } else if (options.removeEphemeralGroups && ephemeralGroups.indexOf(group.name) !== -1) {
@@ -57,6 +60,9 @@
Groups.list = function(options, callback) { Groups.list = function(options, callback) {
db.getSetMembers('groups', function (err, groupNames) { db.getSetMembers('groups', function (err, groupNames) {
if (err) {
return callback(err);
}
groupNames = groupNames.concat(ephemeralGroups); groupNames = groupNames.concat(ephemeralGroups);
async.map(groupNames, function (groupName, next) { async.map(groupNames, function (groupName, next) {