From e77f667a98db678668ce70a964d9be35a8f8d965 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 15 May 2014 23:47:38 -0600 Subject: [PATCH] Revert "feat(todo_archive)" (see http://goo.gl/mCygbz) --- src/controllers/user.js | 2 +- src/models/task.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/controllers/user.js b/src/controllers/user.js index 9e49456616..06d51d6554 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -442,7 +442,7 @@ api.batchUpdate = function(req, res, next) { }else if(response.wasModified){ // Preen 3-day past-completed To-Dos from Angular & mobile app response.todos = _.where(response.todos, function(t) { - return !t.completed || (t.challenge && t.challenge.id) || !t.archived; + return !t.completed || (t.challenge && t.challenge.id) || moment(t.dateCompleted).isAfter(moment().subtract('days',3)); }); res.json(200, response); diff --git a/src/models/task.js b/src/models/task.js index ec183b6d47..e0a695a1d6 100644 --- a/src/models/task.js +++ b/src/models/task.js @@ -73,7 +73,6 @@ var TodoSchema = new Schema( _.defaults({ type: {type:String, 'default': 'todo'}, completed: {type: Boolean, 'default': false}, - archived: {type: Boolean, 'default': false}, dateCompleted: Date, date: String, // due date for todos // FIXME we're getting parse errors, people have stored as "today" and "3/13". Need to run a migration & put this back to type: Date collapseChecklist:collapseChecklist,