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

fix #3146 - filter active users in project team

stable
Juanfran 2015-08-06 12:03:53 +02:00
parent 9c809f0848
commit 4961f26896
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/modules/projects/project/project.controller.coffee
View File

@ -16,6 +16,11 @@ class ProjectController
.getProjectBySlug(projectSlug) .getProjectBySlug(projectSlug)
.then (project) => .then (project) =>
@.project = project @.project = project
members = @.project.get('members').filter (member) -> member.get('is_active')
@.project = @.project.set('members', members)
@._setMeta(@.project) @._setMeta(@.project)
.catch (xhr) => .catch (xhr) =>

21
app/modules/projects/project/project.controller.spec.coffee
View File

@ -1,4 +1,4 @@
describe "ProjectController", -> describe.only "ProjectController", ->
$controller = null $controller = null
$q = null $q = null
provide = null provide = null
@ -69,6 +69,7 @@ describe "ProjectController", ->
it "set local user", () -> it "set local user", () ->
project = Immutable.fromJS({ project = Immutable.fromJS({
name: "projectName" name: "projectName"
members: []
}) })
mocks.projectService.getProjectBySlug.withArgs("project-slug").promise().resolve(project) mocks.projectService.getProjectBySlug.withArgs("project-slug").promise().resolve(project)
@ -82,7 +83,8 @@ describe "ProjectController", ->
$scope = $rootScope.$new() $scope = $rootScope.$new()
project = Immutable.fromJS({ project = Immutable.fromJS({
name: "projectName" name: "projectName"
description: "projectDescription" description: "projectDescription",
members: []
}) })
mocks.translate.instant mocks.translate.instant
@ -100,17 +102,24 @@ describe "ProjectController", ->
done() done()
) )
it "set local project variable", (done) -> it "set local project variable with active members", (done) ->
project = Immutable.fromJS({ project = Immutable.fromJS({
name: "projectName" name: "projectName",
members: [
{is_active: true},
{is_active: true},
{is_active: true},
{is_active: false}
]
}) })
mocks.projectService.getProjectBySlug.withArgs("project-slug").promise().resolve(project) mocks.projectService.getProjectBySlug.withArgs("project-slug").promise().resolve(project)
ctrl = $controller("Project") ctrl = $controller("Project")
setTimeout ( () -> setTimeout (() ->
expect(ctrl.project).to.be.equal(project) expect(ctrl.project.get('members').size).to.be.equal(3)
done() done()
) )