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

Merge pull request #296 from taigaio/team-page-all-fix 

Fix team page all members list
stable
Alejandro 2015-01-29 11:17:12 +01:00
parent 7192d4570f 8d0d89d8b7
commit 68b92ce8e7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
if role if role
@scope.filtersRole = role @scope.filtersRole = role
else else
@scope.filtersRole = "" @scope.filtersRole = null
loadMembers: -> loadMembers: ->
return @rs.memberships.list(@scope.projectId, {}, false).then (data) => 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.directive("tgLeaveProject", ["$tgRepo", "$tgConfirm", "$tgLocation", "$tgResources", "$tgNavUrls", LeaveProjectDirective])
module.filter 'membersRoleFilter', () ->
(input, filtersRole) ->
if filtersRole?
return _.filter(input, {role: filtersRole.id})
return input

2
app/partials/team/team-members.jade
View File

@ -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 .username
figure.avatar figure.avatar
img(tg-bo-src='user.photo', tg-bo-alt='user.full_name') img(tg-bo-src='user.photo', tg-bo-alt='user.full_name')