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

Merge branch 'develop' into party-chat-translations

Browse Source 
# Conflicts:
#	website/server/controllers/api-v3/user.js
This commit is contained in:
Mateus Etto
2018-02-26 19:55:32 +09:00
parent 649404ac6a 01dab33b96
commit d2fcdf4493
774 changed files with 18976 additions and 16904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/server/controllers/api-v3/tasks/groups.js
View File

@@ -86,7 +86,7 @@ api.getGroupTasks = {
middlewares: [authWithHeaders()],
async handler (req, res) {
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty().isUUID();
req.checkQuery('type', res.t('invalidTaskType')).optional().isIn(types);
req.checkQuery('type', res.t('invalidTasksType')).optional().isIn(types);
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -493,8 +493,8 @@ api.getGroupApprovals = {
'group.approval.approved': false,
'group.approval.requested': true,
}, 'userId group text')
.populate('userId', 'profile')
.exec();
.populate('userId', 'profile')
.exec();
res.respond(200, approvals);
},