From 8d0d89d8b7b9a4dd1137e115b6743929fa5010af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 29 Jan 2015 11:13:53 +0100 Subject: [PATCH] Fix team page all members list --- app/coffee/modules/team/main.coffee | 8 +++++++- app/partials/team/team-members.jade | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee index 805432fa..69830a2f 100644 --- a/app/coffee/modules/team/main.coffee +++ b/app/coffee/modules/team/main.coffee @@ -64,7 +64,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin) if role @scope.filtersRole = role else - @scope.filtersRole = "" + @scope.filtersRole = null loadMembers: -> return @rs.memberships.list(@scope.projectId, {}, false).then (data) => @@ -234,3 +234,9 @@ LeaveProjectDirective = ($repo, $confirm, $location, $rs, $navurls) -> } module.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", LeaveProjectDirective]) + +module.filter 'membersRoleFilter', () -> + (input, filtersRole) -> + if filtersRole? + return _.filter(input, {role: filtersRole.id}) + return input diff --git a/app/partials/team/team-members.jade b/app/partials/team/team-members.jade index cf5b2b26..ed77d85d 100644 --- a/app/partials/team/team-members.jade +++ b/app/partials/team/team-members.jade @@ -1,4 +1,4 @@ -.row.member(ng-repeat='user in memberships | filter:filtersQ | filter:{role: filtersRole.id}') +.row.member(ng-repeat='user in memberships | filter:filtersQ | membersRoleFilter:filtersRole') .username figure.avatar img(tg-bo-src='user.photo', tg-bo-alt='user.full_name')