From 4961f2689639e3350d2e825813e149bf0a90a352 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 6 Aug 2015 12:03:53 +0200
Subject: [PATCH] fix #3146 - filter active users in project team

---
 .../project/project.controller.coffee         |  5 +++++
 .../project/project.controller.spec.coffee    | 21 +++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/modules/projects/project/project.controller.coffee b/app/modules/projects/project/project.controller.coffee
index 7d72f4cd..673df954 100644
--- a/app/modules/projects/project/project.controller.coffee
+++ b/app/modules/projects/project/project.controller.coffee
@@ -16,6 +16,11 @@ class ProjectController
             .getProjectBySlug(projectSlug)
             .then (project) =>
                 @.project = project
+
+                members = @.project.get('members').filter (member) -> member.get('is_active')
+
+                @.project = @.project.set('members', members)
+
                 @._setMeta(@.project)
 
             .catch (xhr) =>
diff --git a/app/modules/projects/project/project.controller.spec.coffee b/app/modules/projects/project/project.controller.spec.coffee
index 8bd7aa5f..e450fdef 100644
--- a/app/modules/projects/project/project.controller.spec.coffee
+++ b/app/modules/projects/project/project.controller.spec.coffee
@@ -1,4 +1,4 @@
-describe "ProjectController", ->
+describe.only "ProjectController", ->
     $controller = null
     $q = null
     provide = null
@@ -69,6 +69,7 @@ describe "ProjectController", ->
     it "set local user", () ->
         project = Immutable.fromJS({
             name: "projectName"
+            members: []
         })
 
         mocks.projectService.getProjectBySlug.withArgs("project-slug").promise().resolve(project)
@@ -82,7 +83,8 @@ describe "ProjectController", ->
         $scope = $rootScope.$new()
         project = Immutable.fromJS({
             name: "projectName"
-            description: "projectDescription"
+            description: "projectDescription",
+            members: []
         })
 
         mocks.translate.instant
@@ -100,17 +102,24 @@ describe "ProjectController", ->
             done()
         )
 
-    it "set local project variable", (done) ->
+    it "set local project variable with active members", (done) ->
         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)
 
         ctrl = $controller("Project")
 
-        setTimeout ( () ->
-            expect(ctrl.project).to.be.equal(project)
+        setTimeout (() ->
+            expect(ctrl.project.get('members').size).to.be.equal(3)
+
             done()
         )