From 656aad9134fb331c3d154b59a2483980be3626b6 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 11 Dec 2014 10:09:20 +0100
Subject: [PATCH] Removing disabled users from listings: memberships for admin,
 team section, watchers popup and assigned popup

---
 app/coffee/modules/admin/memberships.coffee | 2 +-
 app/coffee/modules/common/lightboxes.coffee | 4 ++--
 app/coffee/modules/controllerMixins.coffee  | 4 ++++
 app/coffee/modules/team/main.coffee         | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 531d12cf..7a7f8988 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -74,7 +74,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
     loadMembers: ->
         httpFilters = @.getUrlFilters()
         return @rs.memberships.list(@scope.projectId, httpFilters).then (data) =>
-            @scope.memberships = data.models
+            @scope.memberships = _.filter(data.models, (membership) -> membership.user == null or membership.is_user_active)
             @scope.page = data.current
             @scope.count = data.count
             @scope.paginatedBy = data.paginatedBy
diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index dd9e9264..198db241 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -475,7 +475,7 @@ AssignedToLightboxDirective = (lightboxService, lightboxKeyboardNavigationServic
         render = (selected, text) ->
             $el.find("input").focus()
 
-            users = _.clone($scope.users, true)
+            users = _.clone($scope.activeUsers, true)
             users = _.reject(users, {"id": selected.id}) if selected?
             users = _.filter(users, _.partial(filterUsers, text)) if text?
 
@@ -564,7 +564,7 @@ WatchersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNavigationS
                 text = text.toUpperCase()
                 return _.contains(username, text)
 
-            users = _.clone($scope.users, true)
+            users = _.clone($scope.activeUsers, true)
             users = _.filter(users, _.partial(_filterUsers, text))
             return users
 
diff --git a/app/coffee/modules/controllerMixins.coffee b/app/coffee/modules/controllerMixins.coffee
index fdf176e3..cf63d08e 100644
--- a/app/coffee/modules/controllerMixins.coffee
+++ b/app/coffee/modules/controllerMixins.coffee
@@ -33,6 +33,10 @@ toString = @.taiga.toString
 
 class PageMixin
     fillUsersAndRoles: (users, roles) ->
+        activeUsers = _.filter(users, (user) => user.is_active)
+        @scope.activeUsers = _.sortBy(activeUsers, "full_name_display")
+        @scope.activeUsersById = groupBy(@scope.activeUsers, (e) -> e.id)
+
         @scope.users = _.sortBy(users, "full_name_display")
         @scope.usersById = groupBy(@scope.users, (e) -> e.id)
 
diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index bc91a290..4210b013 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -78,7 +78,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
                 @scope.totals[membership.user] = 0
 
             @scope.memberships = _.filter data, (membership) =>
-                if membership.user && membership.user != currentUser.id
+                if membership.user && membership.user != currentUser.id && membership.is_user_active
                     return membership
 
             for membership in @scope.memberships