Fix user list service

stable
Álex Hermida 2018-10-08 18:43:48 +02:00 committed by Alex Hermida
parent 4a8a59a771
commit b0c82769c3
3 changed files with 2 additions and 4 deletions

View File

@ -366,7 +366,6 @@ $compile, avatarService, $userListService) ->
render = (selected, text) ->
users = $userListService.searchUsers(text, selected)
visibleUsers = _.slice(users, 0, 5)
visibleUsers = _.map visibleUsers, (user) ->
user.avatar = avatarService.getAvatar(user)

View File

@ -36,7 +36,7 @@ class PageMixin
@scope.activeUsersById = groupBy(@scope.activeUsers, (e) -> e.id)
@scope.users = _.sortBy(users, "full_name_display")
@scope.usersById = groupBy(@scope.users, (e) -> e.id)
@scope.usersById = groupBy(users, (e) -> e.id)
@scope.roles = _.sortBy(roles, "order")
computableRoles = _(@scope.project.members).map("role").uniq().value()

View File

@ -28,7 +28,6 @@ class UserListService
constructor: (@currentUserService, @projectService) ->
@.currentUser = @currentUserService.getUser().toJS()
@.members = @projectService.project.toJS().members
filterUsers: (text, user) ->
username = user.full_name_display.toUpperCase()
@ -38,7 +37,7 @@ class UserListService
return _.includes(username, text)
searchUsers: (text, excludedUser) ->
users = _.clone(@.members, true)
users = _.clone(@projectService.activeMembers.toJS(), true)
users = _.reject(users, {"id": excludedUser.id}) if excludedUser
users = _.sortBy(users, (o) => if o.id is @.currentUser.id then 0 else o.id)
users = _.filter(users, _.partial(@.filterUsers, text)) if text?