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

Add assigned users filter

stable
Álex Hermida 2018-06-14 16:58:24 +02:00 committed by Miguel Gonzalez
parent 0fb93e74e0
commit 6241beae1d
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,7 @@ class UsFiltersMixin
loadFilters.project = @scope.projectId loadFilters.project = @scope.projectId
loadFilters.tags = urlfilters.tags loadFilters.tags = urlfilters.tags
loadFilters.status = urlfilters.status loadFilters.status = urlfilters.status
loadFilters.assigned_users = urlfilters.assigned_users
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.epic = urlfilters.epic
@ -249,6 +250,15 @@ class UsFiltersMixin
return it return it
tagsWithAtLeastOneElement = _.filter tags, (tag) -> tagsWithAtLeastOneElement = _.filter tags, (tag) ->
return tag.count > 0 return tag.count > 0
assignedUsers = _.map data.assigned_users, (it) ->
if it.id
it.id = it.id.toString()
else
it.id = "null"
it.name = it.full_name || "Unassigned"
return it
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()
@ -292,6 +302,10 @@ class UsFiltersMixin
selected = @.formatSelectedFilters("tags", tags, loadFilters.tags) selected = @.formatSelectedFilters("tags", tags, loadFilters.tags)
@.selectedFilters = @.selectedFilters.concat(selected) @.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.assigned_users
selected = @.formatSelectedFilters("assigned_users", assignedUsers, loadFilters.assigned_users)
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.assigned_to if loadFilters.assigned_to
selected = @.formatSelectedFilters("assigned_to", assignedTo, loadFilters.assigned_to) selected = @.formatSelectedFilters("assigned_to", assignedTo, loadFilters.assigned_to)
@.selectedFilters = @.selectedFilters.concat(selected) @.selectedFilters = @.selectedFilters.concat(selected)
@ -324,9 +338,9 @@ class UsFiltersMixin
totalTaggedElements: tagsWithAtLeastOneElement.length totalTaggedElements: tagsWithAtLeastOneElement.length
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ASSIGNED_TO"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.ASSIGNED_USERS"),
dataType: "assigned_to", dataType: "assigned_users",
content: assignedTo content: assignedUsers
}, },
{ {
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"), title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"),

1
app/locales/taiga/locale-en.json
View File

@ -221,6 +221,7 @@
"PRIORITIES": "Priorities", "PRIORITIES": "Priorities",
"TAGS": "Tags", "TAGS": "Tags",
"ASSIGNED_TO": "Assigned to", "ASSIGNED_TO": "Assigned to",
"ASSIGNED_USERS": "Assigned users",
"ROLE": "Role", "ROLE": "Role",
"CREATED_BY": "Created by", "CREATED_BY": "Created by",
"CUSTOM_FILTERS": "Custom filters", "CUSTOM_FILTERS": "Custom filters",