From 55001a01b552c2e96319e0b88d5dc30a36e6e9bc Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Fri, 8 Aug 2014 09:16:31 +0200
Subject: [PATCH] fix #320

---
 app/coffee/modules/backlog/main.coffee                  | 6 ++++++
 app/coffee/modules/common/popovers.coffee               | 6 ++++--
 app/partials/admin-project-values-issue-severities.jade | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index bea0f221..d51f0965 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -324,6 +324,10 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
             return obj
 
         plainStatuses = _.map(@scope.userstories, "status")
+        plainStatuses = _.filter plainStatuses, (status) =>
+            if status
+                return status
+
         @scope.filters.statuses = _.map _.countBy(plainStatuses), (v, k) =>
             obj = {
                 id: k,
@@ -333,8 +337,10 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
                 count:v
             }
             obj.selected = true if isSelected("statuses", obj.id)
+
             return obj
 
+
         return @scope.filters
 
     ## Template actions
diff --git a/app/coffee/modules/common/popovers.coffee b/app/coffee/modules/common/popovers.coffee
index e91c78e7..05ba641a 100644
--- a/app/coffee/modules/common/popovers.coffee
+++ b/app/coffee/modules/common/popovers.coffee
@@ -57,8 +57,10 @@ UsStatusDirective = ($repo, popoverService) ->
     updateUsStatus = ($el, us, usStatusById) ->
         usStatusDomParent = $el.find(".us-status")
         usStatusDom = $el.find(".us-status .us-status-bind")
-        usStatusDom.text(usStatusById[us.status].name)
-        usStatusDomParent.css('color', usStatusById[us.status].color)
+
+        if usStatusById[us.status]
+            usStatusDom.text(usStatusById[us.status].name)
+            usStatusDomParent.css('color', usStatusById[us.status].color)
 
     link = ($scope, $el, $attrs) ->
         $ctrl = $el.controller()
diff --git a/app/partials/admin-project-values-issue-severities.jade b/app/partials/admin-project-values-issue-severities.jade
index 8efe0d67..b49dc344 100644
--- a/app/partials/admin-project-values-issue-severities.jade
+++ b/app/partials/admin-project-values-issue-severities.jade
@@ -6,7 +6,7 @@ block head
 block content
     div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl",
                 ng-init="section='admin'; resource='issues'; type='severities'; sectionName='Issue severities'",
-                type="priorities")
+                type="severities")
         sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values")
             include views/modules/admin-menu