From eea9a2129f7269bc254482e365db31440c8c2d15 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 10 May 2013 18:06:35 +0100
Subject: [PATCH] tags: some corrupt-tags bug fixes

---
 src/app/filters.coffee | 13 ++++++++-----
 src/app/helpers.coffee |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/app/filters.coffee b/src/app/filters.coffee
index ddded997aa..8042e87161 100644
--- a/src/app/filters.coffee
+++ b/src/app/filters.coffee
@@ -25,15 +25,18 @@ module.exports.app = (appExports, model) ->
   appExports.filtersDeleteTag = (e, el) ->
     tags = user.get('tags')
     tagId = $(el).attr('data-tag-id')
+
+    #something got corrupted, let's clear the corrupt tags
+    unless tagId
+      user.set 'tags', _.filter( tags, ((t)-> t?.id) )
+      user.set 'filters', {}
+      return
+
     model.del "_user.filters.#{tagId}"
     _.each tags, (tag, i) ->
-      if tag.id is tagId
-        tags.splice(i,1)
-        model.del "_user.filters.#{tag.id}"
+      model.remove "_user.tags", i if tag.id is tagId
 
     # remove tag from all tasks
     _.each user.get("tasks"), (task) ->
       user.del "tasks.#{task.id}.tags.#{tagId}"
 
-    model.set "_user.tags", tags , -> browser.resetDom(model)
-
diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 70257ae2bf..406fca72b2 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -187,6 +187,7 @@ viewHelpers = (view) ->
   view.fn 'appliedTags', (userTags, taskTags) ->
     arr = []
     _.each userTags, (t) ->
+      return unless t?
       arr.push(t.name) if taskTags?[t.id]
     arr.join(', ')