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

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-03-10 18:30:09 +01:00
parent ec13a34228 a9c9d6d1cc
commit fbdbd8e006
157 changed files with 8200 additions and 7329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/src/controllers/api-v2/user.js
View File

@@ -354,7 +354,15 @@ api.update = (req, res, next) => {
user.save((err) => {
if (!_.isEmpty(errors)) return res.json(401, {err: errors});
if (err) return next(err);
if (err) {
if (err.name == 'ValidationError') {
let errorMessages = _.map(_.values(err.errors), (error) => {
return error.message;
});
return res.json(400, {err: errorMessages});
}
return next(err);
}
res.json(200, user);
user = errors = null;