From 2a4680b5293a7c73e6cd93947ba4840f4d764875 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 26 Nov 2014 14:57:33 +0100 Subject: [PATCH] add role to the current user & remove the user from the team list --- app/coffee/modules/team/main.coffee | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee index 10c4402c..f5fdf26a 100644 --- a/app/coffee/modules/team/main.coffee +++ b/app/coffee/modules/team/main.coffee @@ -55,8 +55,6 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin) # On Error promise.then null, @.onInitialDataError.bind(@) - @scope.currentUser = @auth.getUser() - setRole: (role) -> if role @scope.filtersRole = role @@ -65,7 +63,15 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin) loadMembers: -> return @rs.memberships.list(@scope.projectId, {}, false).then (data) => - @scope.memberships = _.filter(data, (membership) => membership.user?) + currentUser = @auth.getUser() + + @scope.currentUser = _.find data, (membership) => + return membership.user == currentUser.id + + @scope.memberships = _.filter data, (membership) => + if membership.user && membership.user != currentUser.id + return membership + return data loadProject: -> @@ -172,7 +178,7 @@ TeamMemberStatsDirective = () -> module.directive("tgTeamMemberStats", TeamMemberStatsDirective) ############################################################################# -## Team Member Directive +## Team Current User Directive ############################################################################# TeamMemberCurrentUserDirective = () -> @@ -180,14 +186,15 @@ TeamMemberCurrentUserDirective = () ->
- +
- + +
-
+
""" return {