Commit 978bc81646ff6e7823ef6de3c2717d4780cd8da7
Exists in
master
and in
4 other branches
Merge pull request #4163 from jdamick/slow_team_list
addresses issue #4156
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
app/views/team_members/_team.html.haml
| 1 | +- can_admin_project = (can? current_user, :admin_project, @project) | ||
| 1 | - team.each do |access, members| | 2 | - team.each do |access, members| |
| 2 | - role = Project.access_options.key(access).pluralize | 3 | - role = Project.access_options.key(access).pluralize |
| 3 | .ui-box{class: role.downcase} | 4 | .ui-box{class: role.downcase} |
| @@ -6,4 +7,4 @@ | @@ -6,4 +7,4 @@ | ||
| 6 | %span.light (#{members.size}) | 7 | %span.light (#{members.size}) |
| 7 | %ul.well-list | 8 | %ul.well-list |
| 8 | - members.sort_by(&:user_name).each do |team_member| | 9 | - members.sort_by(&:user_name).each do |team_member| |
| 9 | - = render 'team_members/team_member', member: team_member | 10 | + = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project |
app/views/team_members/_team_member.html.haml
| 1 | - user = member.user | 1 | - user = member.user |
| 2 | -- allow_admin = can? current_user, :admin_project, @project | 2 | +- allow_admin = current_user_can_admin_project |
| 3 | %li{id: dom_id(user), class: "team_member_row user_#{user.id}"} | 3 | %li{id: dom_id(user), class: "team_member_row user_#{user.id}"} |
| 4 | .row | 4 | .row |
| 5 | .span4 | 5 | .span4 |