Add assigned users filter

stable
Álex Hermida 2018-06-14 16:58:24 +02:00
parent e21cf1eabd
commit 867ddb5fd0
3 changed files with 24 additions and 9 deletions

View File

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

View File

@ -95,7 +95,7 @@ class KanbanUserstoriesService extends taiga.Service
move: (usList, statusId, index) ->
initialLength = usList.length
usByStatus = _.filter @.userstoriesRaw, (it) =>
return it.status == statusId
@ -130,19 +130,19 @@ class KanbanUserstoriesService extends taiga.Service
previousWithTheSameOrder = _.filter(beforeDestination, (it) =>
it.kanban_order == @.order[previous.id]
)
)
for it, key in afterDestination # increase position of the us after the dragged us's
@.order[it.id] = @.order[previous.id] + key + initialLength + 1
it.kanban_order = @.order[it.id]
it.kanban_order = @.order[it.id]
setNextOrders = _.map(afterDestination, (it) =>
{us_id: it.id, order: @.order[it.id]}
)
)
# we must send the USs previous to the dropped USs to tell the backend
# which USs are before the dropped USs, if they have the same value to
# order, the backend doens't know after which one do you want to drop
# the USs
# the USs
if previousWithTheSameOrder.length > 1
setPreviousOrders = _.map(previousWithTheSameOrder, (it) =>
{us_id: it.id, order: @.order[it.id]}
@ -153,7 +153,7 @@ class KanbanUserstoriesService extends taiga.Service
us.kanban_order = startIndex + key
@.order[us.id] = us.kanban_order
modifiedUs.push({us_id: us.id, order: us.kanban_order})
modifiedUs.push({us_id: us.id, order: us.kanban_order})
@.refresh()

View File

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