Filtering by epic in backlog and kanban

stable
Alejandro Alonso 2016-09-22 12:33:57 +02:00 committed by David Barragán Merino
parent a0e95d36ca
commit 2950020bea
2 changed files with 21 additions and 3 deletions

View File

@ -204,6 +204,7 @@ class UsFiltersMixin
loadFilters.status = urlfilters.status loadFilters.status = urlfilters.status
loadFilters.assigned_to = urlfilters.assigned_to loadFilters.assigned_to = urlfilters.assigned_to
loadFilters.owner = urlfilters.owner loadFilters.owner = urlfilters.owner
loadFilters.epic = urlfilters.epic
loadFilters.q = urlfilters.q loadFilters.q = urlfilters.q
return @q.all([ return @q.all([
@ -221,10 +222,8 @@ class UsFiltersMixin
it.id = it.name it.id = it.name
return it return it
tagsWithAtLeastOneElement = _.filter tags, (tag) -> tagsWithAtLeastOneElement = _.filter tags, (tag) ->
return tag.count > 0 return tag.count > 0
assignedTo = _.map data.assigned_to, (it) -> assignedTo = _.map data.assigned_to, (it) ->
if it.id if it.id
it.id = it.id.toString() it.id = it.id.toString()
@ -239,6 +238,15 @@ class UsFiltersMixin
it.name = it.full_name it.name = it.full_name
return it return it
epic = _.map data.epics, (it) ->
if it.id
it.id = it.id.toString()
it.name = "##{it.ref} #{it.subject}"
else
it.id = "null"
it.name = "Not in an epic"
return it
@.selectedFilters = [] @.selectedFilters = []
@ -258,6 +266,10 @@ class UsFiltersMixin
selected = @.formatSelectedFilters("owner", owner, loadFilters.owner) selected = @.formatSelectedFilters("owner", owner, loadFilters.owner)
@.selectedFilters = @.selectedFilters.concat(selected) @.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.epic
selected = @.formatSelectedFilters("epic", epic, loadFilters.epic)
@.selectedFilters = @.selectedFilters.concat(selected)
@.filterQ = loadFilters.q @.filterQ = loadFilters.q
@.filters = [ @.filters = [
@ -282,6 +294,11 @@ class UsFiltersMixin
title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"),
dataType: "owner", dataType: "owner",
content: owner content: owner
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.EPIC"),
dataType: "epic",
content: epic
} }
] ]

View File

@ -218,7 +218,8 @@
"TAGS": "Tags", "TAGS": "Tags",
"ASSIGNED_TO": "Assigned to", "ASSIGNED_TO": "Assigned to",
"CREATED_BY": "Created by", "CREATED_BY": "Created by",
"CUSTOM_FILTERS": "Custom filters" "CUSTOM_FILTERS": "Custom filters",
"EPIC": "Epic"
}, },
"CONFIRM_DELETE": { "CONFIRM_DELETE": {
"TITLE": "Delete custom filter", "TITLE": "Delete custom filter",