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

Merge pull request #206 from taigaio/bug/1743/historic-deleted-users-appears-in-listings 

Removing disabled users from listings: memberships for admin, team section, watchers popup and assigned popup
stable
Jesús Espino 2014-12-23 16:24:52 +00:00
parent 9ea16b30bf 656aad9134
commit 6ea7c3bd2e
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/admin/memberships.coffee
View File

@ -74,7 +74,7 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai
loadMembers: -> loadMembers: ->
httpFilters = @.getUrlFilters() httpFilters = @.getUrlFilters()
return @rs.memberships.list(@scope.projectId, httpFilters).then (data) => 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.page = data.current
@scope.count = data.count @scope.count = data.count
@scope.paginatedBy = data.paginatedBy @scope.paginatedBy = data.paginatedBy

4
app/coffee/modules/common/lightboxes.coffee
View File

@ -475,7 +475,7 @@ AssignedToLightboxDirective = (lightboxService, lightboxKeyboardNavigationServic
render = (selected, text) -> render = (selected, text) ->
$el.find("input").focus() $el.find("input").focus()
users = _.clone($scope.users, true) users = _.clone($scope.activeUsers, true)
users = _.reject(users, {"id": selected.id}) if selected? users = _.reject(users, {"id": selected.id}) if selected?
users = _.filter(users, _.partial(filterUsers, text)) if text? users = _.filter(users, _.partial(filterUsers, text)) if text?
@ -564,7 +564,7 @@ WatchersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNavigationS
text = text.toUpperCase() text = text.toUpperCase()
return _.contains(username, text) return _.contains(username, text)
users = _.clone($scope.users, true) users = _.clone($scope.activeUsers, true)
users = _.filter(users, _.partial(_filterUsers, text)) users = _.filter(users, _.partial(_filterUsers, text))
return users return users

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

@ -33,6 +33,10 @@ toString = @.taiga.toString
class PageMixin class PageMixin
fillUsersAndRoles: (users, roles) -> 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.users = _.sortBy(users, "full_name_display")
@scope.usersById = groupBy(@scope.users, (e) -> e.id) @scope.usersById = groupBy(@scope.users, (e) -> e.id)

2
app/coffee/modules/team/main.coffee
View File

@ -78,7 +78,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
@scope.totals[membership.user] = 0 @scope.totals[membership.user] = 0
@scope.memberships = _.filter data, (membership) => @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 return membership
for membership in @scope.memberships for membership in @scope.memberships