Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-06 14:50:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into sortable-menu

Browse Source
This commit is contained in:
psychobunny
2015-02-25 13:56:57 -05:00
parent 6cea047518 29873f1c5c
commit 40008a9e85
8 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/groups.js
View File

@@ -135,7 +135,19 @@ var async = require('async'),
userObj.isOwner = isOwner;
next(null, userObj);
});
}, next);
}, function(err, users) {
if (err) {
return next();
}
next(null, users.sort(function(a, b) {
if (a.isOwner === b.isOwner) {
return 0;
} else {
return a.isOwner && !b.isOwner ? -1 : 1;
}
}));
});
}
], next);
} else {
@@ -216,6 +228,7 @@ var async = require('async'),
results.base.description = validator.escape(results.base.description);
results.base.descriptionParsed = descriptionParsed;
results.base.userTitle = validator.escape(results.base.userTitle);
results.base.userTitleEnabled = results.base.userTitleEnabled ? !!parseInt(results.base.userTitleEnabled, 10) : true;
results.base.createtimeISO = utils.toISOString(results.base.createtime);
results.base.members = results.users.filter(Boolean);
results.base.pending = results.pending.filter(Boolean);
@@ -525,6 +538,7 @@ var async = require('async'),
var payload = {
userTitle: values.userTitle || '',
userTitleEnabled: values.userTitleEnabled === true ? '1' : '0',
description: values.description || '',
icon: values.icon || '',
labelColor: values.labelColor || '#000000',
@@ -879,6 +893,8 @@ var async = require('async'),
}
groupData = groupData.map(function(group) {
if (group) {
group.userTitle = validator.escape(group.userTitle) || validator.escape(group.name);
group.userTitleEnabled = group.userTitleEnabled ? parseInt(group.userTitleEnabled, 10) === 1 : true;
group.labelColor = group.labelColor || '#000000';
group.createtimeISO = utils.toISOString(group.createtime);
group.hidden = parseInt(group.hidden, 10) === 1;
@@ -913,7 +929,7 @@ var async = require('async'),
}
groupData = groupData.filter(function(group) {
return group && parseInt(group.hidden, 10) !== 1 && !!group.userTitle;
return group && parseInt(group.hidden, 10) !== 1;
});
var groupSets = groupData.map(function(group) {

14
src/user/notifications.js
View File

@@ -89,20 +89,6 @@ var async = require('async'),
});
}
UserNotifications.getAll = function(uid, count, callback) {
getNotifications(uid, count, function(err, notifs) {
if (err) {
return callback(err);
}
notifs = notifs.unread.concat(notifs.read);
notifs = notifs.filter(Boolean).sort(function(a, b) {
return b.datetime - a.datetime;
});
callback(null, notifs);
});
};
UserNotifications.getNotifications = function(nids, uid, callback) {
notifications.getMultiple(nids, function(err, notifications) {
if (err) {