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

Fixing epic filtering

stable
Alejandro Alonso 2016-09-27 07:44:32 +02:00 committed by David Barragán Merino
parent 636a44e0f9
commit 1bc2eb0344
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/coffee/modules/controllerMixins.coffee
View File

@ -204,7 +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.epics = urlfilters.epics loadFilters.epic = urlfilters.epic
loadFilters.q = urlfilters.q loadFilters.q = urlfilters.q
return @q.all([ return @q.all([
@ -238,7 +238,7 @@ class UsFiltersMixin
it.name = it.full_name it.name = it.full_name
return it return it
epics = _.map data.epics, (it) -> epic = _.map data.epics, (it) ->
if it.id if it.id
it.id = it.id.toString() it.id = it.id.toString()
it.name = "##{it.ref} #{it.subject}" it.name = "##{it.ref} #{it.subject}"
@ -266,8 +266,8 @@ class UsFiltersMixin
selected = @.formatSelectedFilters("owner", owner, loadFilters.owner) selected = @.formatSelectedFilters("owner", owner, loadFilters.owner)
@.selectedFilters = @.selectedFilters.concat(selected) @.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.epics if loadFilters.epic
selected = @.formatSelectedFilters("epics", epics, loadFilters.epics) selected = @.formatSelectedFilters("epic", epic, loadFilters.epic)
@.selectedFilters = @.selectedFilters.concat(selected) @.selectedFilters = @.selectedFilters.concat(selected)
@.filterQ = loadFilters.q @.filterQ = loadFilters.q
@ -297,8 +297,8 @@ class UsFiltersMixin
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.EPIC"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.EPIC"),
dataType: "epics", dataType: "epic",
content: epics content: epic
} }
] ]