Skip to content

Fix deprecated use of res.json(status,obj) #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robbyoconnor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deprecated use of res.json(status,obj) #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ module.exports = function (registry) {

dependencies.check(models, modelName, id, function (err, depPair) {
if (err) throw err;
if (_.isEmpty(depPair)) return res.json(200, []);
if (_.isEmpty(depPair)) return res.send(200).json([]);
var deps = depPair[1];
var lines = dependencies.depsToLines(deps);
return res.json(200, lines);
return res.send(200).json(lines);
});
},

Expand Down Expand Up @@ -174,11 +174,11 @@ module.exports = function (registry) {
}
).then(
function (response) {
res.json(200, response);
res.send(200).json(response);
},
function (err) {
err.form = res._debug_form;
res.json(422, err);
err.form = res._debug_form;
res.send(422).json(err);
}
).end();
},
Expand All @@ -197,8 +197,8 @@ module.exports = function (registry) {
]);
modelConfig.model.update({_id: id}, {'$set': set_dict}, cb);
}, function (err) {
if (err) throw err;
res.json({"collection": modelName});
if (err) throw err;
res.send(200).json({"collection": modelName});
});
},

Expand All @@ -217,8 +217,8 @@ module.exports = function (registry) {
throw new TypeError('Could not find action with id=' + actionId);

return action.func.call(model, req.admin_user, ids, function (err, message) {
if (err) return res.json(422, { error: err.message });
return res.json(message || 'All is good.');
if (err) return res.send(422).json({ error: err.message });
return res.send(200).json(message || 'All is good.');
});
}
},
Expand Down