taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix #320

stable
Juanfran 2014-08-08 09:16:31 +02:00
parent 91a78ab5f3
commit 55001a01b5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/coffee/modules/backlog/main.coffee
View File

@ -324,6 +324,10 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
return obj return obj
plainStatuses = _.map(@scope.userstories, "status") plainStatuses = _.map(@scope.userstories, "status")
plainStatuses = _.filter plainStatuses, (status) =>
if status
return status
@scope.filters.statuses = _.map _.countBy(plainStatuses), (v, k) => @scope.filters.statuses = _.map _.countBy(plainStatuses), (v, k) =>
obj = { obj = {
id: k, id: k,
@ -333,8 +337,10 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
count:v count:v
} }
obj.selected = true if isSelected("statuses", obj.id) obj.selected = true if isSelected("statuses", obj.id)
return obj return obj
return @scope.filters return @scope.filters
## Template actions ## Template actions

6
app/coffee/modules/common/popovers.coffee
View File

@ -57,8 +57,10 @@ UsStatusDirective = ($repo, popoverService) ->
updateUsStatus = ($el, us, usStatusById) -> updateUsStatus = ($el, us, usStatusById) ->
usStatusDomParent = $el.find(".us-status") usStatusDomParent = $el.find(".us-status")
usStatusDom = $el.find(".us-status .us-status-bind") 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) -> link = ($scope, $el, $attrs) ->
$ctrl = $el.controller() $ctrl = $el.controller()

2
app/partials/admin-project-values-issue-severities.jade
View File

@ -6,7 +6,7 @@ block head
block content block content
div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl", div.wrapper(tg-project-values, ng-controller="ProjectValuesController as ctrl",
ng-init="section='admin'; resource='issues'; type='severities'; sectionName='Issue severities'", ng-init="section='admin'; resource='issues'; type='severities'; sectionName='Issue severities'",
type="priorities") type="severities")
sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values")
include views/modules/admin-menu include views/modules/admin-menu