From bd0ee0064804d11902eb23ccf39bd370565b4747 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Tue, 16 Jun 2015 13:18:24 +0200 Subject: [PATCH] filter inactive memberships in a team --- app/coffee/modules/team/main.coffee | 2 ++ .../user-timeline/user-timeline/user-timeline.service.coffee | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee index 355a030e..6175b035 100644 --- a/app/coffee/modules/team/main.coffee +++ b/app/coffee/modules/team/main.coffee @@ -89,6 +89,8 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin) if membership.user && (not currentUser? or membership.user != currentUser.id) return membership + @scope.memberships = _.filter memberships, (membership) => return membership.is_active + for membership in @scope.memberships if not membership.photo? membership.photo = "/images/unnamed.png" diff --git a/app/modules/user-timeline/user-timeline/user-timeline.service.coffee b/app/modules/user-timeline/user-timeline/user-timeline.service.coffee index 481629da..2672c735 100644 --- a/app/modules/user-timeline/user-timeline/user-timeline.service.coffee +++ b/app/modules/user-timeline/user-timeline/user-timeline.service.coffee @@ -45,7 +45,6 @@ class UserTimelineService extends taiga.Service return false else if values[0] == 'attachments' && values_diff.get('attachments').get('new').size == 0 - return false if timeline.get("data").get("comment_deleted")