krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix loading owned messages (#11147)

Browse Source
This commit is contained in:
negue
2019-05-03 15:53:35 +02:00
committed by Matteo Pagliazzi
parent 95c1893b0c
commit f84562446d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/server/controllers/api-v3/challenges.js
View File

@@ -364,12 +364,14 @@ api.getUserChallenges = {
$and: [{$or: orOptions}], $and: [{$or: orOptions}],
}; };
if (owned && owned === 'not_owned') { if (owned) {
query.$and.push({leader: {$ne: user._id}}); if (owned === 'not_owned') {
query.$and = [{leader: {$ne: user._id}}];
} }
if (owned && owned === 'owned') { if (owned === 'owned') {
query.$and.push({leader: user._id}); query.$and = [{leader: user._id}];
}
} }
if (req.query.search) { if (req.query.search) {
@@ -400,7 +402,6 @@ api.getUserChallenges = {
// .populate('leader', nameFields) // .populate('leader', nameFields)
const challenges = await mongoQuery.exec(); const challenges = await mongoQuery.exec();
let resChals = challenges.map(challenge => challenge.toJSON()); let resChals = challenges.map(challenge => challenge.toJSON());
resChals = _.orderBy(resChals, [challenge => { resChals = _.orderBy(resChals, [challenge => {