add api.deleteTag to batch update operations

This commit is contained in:
Matteo Pagliazzi
2013-10-24 18:21:34 +02:00
parent 211433858c
commit 1f8915f5de
2 changed files with 10 additions and 6 deletions
+1 -4
View File
@@ -37,10 +37,7 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'API_URL', '
_.each(user.tasks, function(task) {
delete task.tags[tag.id];
});
$http['delete'](API_URL + '/api/v1/user/tags/' + tag.id)
.error(function(data){
alert(data);
})
User.log({op:'delTag',data:{'tag':tag.id}})
}
}]);
+9 -2
View File
@@ -668,7 +668,8 @@ api.buyGemsPaypalIPN = function(req, res) {
*/
api.deleteTag = function(req, res){
var user = res.locals.user;
var i = _.findIndex(user.tags, {id:req.params.tid});
var tid = req.params.tid || req.body.tag;
var i = _.findIndex(user.tags, {id:tid});
if (~i) {
var tag = user.tags[i];
delete user.filters[tag.id];
@@ -678,8 +679,11 @@ api.deleteTag = function(req, res){
delete user.tasks[task.id].tags[tag.id];
});
user.save(function(err,saved){
if (err) return res.json(500, {err: err});
// Need to use this until we found a way to update the ui for tasks when a tag is deleted
res.locals.wasModified = true;
res.send(200);
})
});
} else {
res.json(400, {err:'Tag not found'});
}
@@ -743,6 +747,9 @@ api.batchUpdate = function(req, res, next) {
case "set":
api.updateUser(req, res);
break;
case "delTag":
api.deleteTag(req, res);
break;
case "revive":
api.revive(req, res);
break;