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

Add role filtering

stable
Jesús Espino 2017-11-07 18:53:10 +01:00 committed by Alex Hermida
parent ebe70b2f0c
commit 6fe84f9acd
4 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,7 @@ class UsFiltersMixin
filters.assigned_to = urlfilters.assigned_to
filters.owner = urlfilters.owner
filters.epic = urlfilters.epic
filters.role = urlfilters.role
@filterRemoteStorageService.getFilters(@scope.projectId, @.storeCustomFiltersName).then (userFilters) =>
userFilters[name] = filters
@ -219,6 +220,7 @@ class UsFiltersMixin
loadFilters.assigned_to = urlfilters.assigned_to
loadFilters.owner = urlfilters.owner
loadFilters.epic = urlfilters.epic
loadFilters.role = urlfilters.role
loadFilters.q = urlfilters.q
if milestone
@ -249,6 +251,15 @@ class UsFiltersMixin
it.name = it.full_name || "Unassigned"
return it
role = _.map data.roles, (it) ->
if it.id
it.id = it.id.toString()
else
it.id = "null"
it.name = it.name || "Unassigned"
return it
owner = _.map data.owners, (it) ->
it.id = it.id.toString()
@ -287,6 +298,10 @@ class UsFiltersMixin
selected = @.formatSelectedFilters("epic", epic, loadFilters.epic)
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.role
selected = @.formatSelectedFilters("role", role, loadFilters.role)
@.selectedFilters = @.selectedFilters.concat(selected)
@.filterQ = loadFilters.q
@.filters = [
@ -307,6 +322,11 @@ class UsFiltersMixin
dataType: "assigned_to",
content: assignedTo
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"),
dataType: "role",
content: role
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"),
dataType: "owner",

20
app/coffee/modules/issues/list.coffee
View File

@ -137,6 +137,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
filters.priority = urlfilters.priority
filters.assigned_to = urlfilters.assigned_to
filters.owner = urlfilters.owner
filters.role = urlfilters.role
@filterRemoteStorageService.getFilters(@scope.projectId, @.myFiltersHashSuffix).then (userFilters) =>
userFilters[name] = filters
@ -157,6 +158,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
loadFilters.priority = urlfilters.priority
loadFilters.assigned_to = urlfilters.assigned_to
loadFilters.owner = urlfilters.owner
loadFilters.role = urlfilters.role
loadFilters.q = urlfilters.q
return @q.all([
@ -203,6 +205,15 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
it.id = it.id.toString()
it.name = it.full_name
return it
role = _.map data.roles, (it) ->
if it.id
it.id = it.id.toString()
else
it.id = "null"
it.name = it.name || "Unassigned"
return it
@.selectedFilters = []
@ -235,6 +246,10 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
selected = @.formatSelectedFilters("priority", priority, loadFilters.priority)
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.role
selected = @.formatSelectedFilters("role", role, loadFilters.role)
@.selectedFilters = @.selectedFilters.concat(selected)
@.filterQ = loadFilters.q
@.filters = [
@ -270,6 +285,11 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
dataType: "assigned_to",
content: assignedTo
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"),
dataType: "role",
content: role
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"),
dataType: "owner",

20
app/coffee/modules/taskboard/main.coffee
View File

@ -141,6 +141,7 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
filters.status = urlfilters.status
filters.assigned_to = urlfilters.assigned_to
filters.owner = urlfilters.owner
filters.role = urlfilters.role
@filterRemoteStorageService.getFilters(@scope.projectId, 'tasks-custom-filters').then (userFilters) =>
userFilters[name] = filters
@ -159,6 +160,7 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
loadFilters.status = urlfilters.status
loadFilters.assigned_to = urlfilters.assigned_to
loadFilters.owner = urlfilters.owner
loadFilters.role = urlfilters.role
loadFilters.q = urlfilters.q
return @q.all([
@ -188,6 +190,15 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
it.name = it.full_name || "Unassigned"
return it
role = _.map data.roles, (it) ->
if it.id
it.id = it.id.toString()
else
it.id = "null"
it.name = it.name || "Unassigned"
return it
owner = _.map data.owners, (it) ->
it.id = it.id.toString()
@ -213,6 +224,10 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
selected = @.formatSelectedFilters("owner", owner, loadFilters.owner)
@.selectedFilters = @.selectedFilters.concat(selected)
if loadFilters.role
selected = @.formatSelectedFilters("role", role, loadFilters.role)
@.selectedFilters = @.selectedFilters.concat(selected)
@.filterQ = loadFilters.q
@.filters = [
@ -233,6 +248,11 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
dataType: "assigned_to",
content: assignedTo
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.ROLE"),
dataType: "role",
content: role
},
{
title: @translate.instant("COMMON.FILTERS.CATEGORIES.CREATED_BY"),
dataType: "owner",

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

@ -207,6 +207,7 @@
"PRIORITIES": "Priorities",
"TAGS": "Tags",
"ASSIGNED_TO": "Assigned to",
"ROLE": "Role",
"CREATED_BY": "Created by",
"CUSTOM_FILTERS": "Custom filters",
"EPIC": "Epic"