resolving conflicts

This commit is contained in:
Victor Piousbox
2016-04-04 16:37:51 +00:00
20 changed files with 582 additions and 114 deletions

View File

@@ -1,5 +1,6 @@
import _ from 'lodash';
module.exports = function(user, req) {
delete user.preferences.webhooks[req.params.id];
module.exports = function deleteWebhook (user, req) {
delete user.preferences.webhooks[_.get(req, 'params.id')];
user.markModified('preferences.webhooks');
};