diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-06 11:24:25 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-06 11:24:25 -0700 |
| commit | 978bc81646ff6e7823ef6de3c2717d4780cd8da7 (patch) | |
| tree | a90c438231ee2669ed228f6d7d1318441d3b366b | |
| parent | 66c817677cc495ed284ebf44d3bef3b51f6b4ea1 (diff) | |
| parent | 63968c1a424debe8f5c6b5c23fbdff302bf57e3c (diff) | |
| download | gitlab-ce-978bc81646ff6e7823ef6de3c2717d4780cd8da7.tar.gz | |
Merge pull request #4163 from jdamick/slow_team_list
addresses issue #4156
| -rw-r--r-- | app/views/team_members/_team.html.haml | 3 | ||||
| -rw-r--r-- | app/views/team_members/_team_member.html.haml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/team_members/_team.html.haml b/app/views/team_members/_team.html.haml index 4b49b308edc..4ff170ac86e 100644 --- a/app/views/team_members/_team.html.haml +++ b/app/views/team_members/_team.html.haml @@ -1,3 +1,4 @@ +- can_admin_project = (can? current_user, :admin_project, @project) - team.each do |access, members| - role = Project.access_options.key(access).pluralize .ui-box{class: role.downcase} @@ -6,4 +7,4 @@ %span.light (#{members.size}) %ul.well-list - members.sort_by(&:user_name).each do |team_member| - = render 'team_members/team_member', member: team_member + = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project diff --git a/app/views/team_members/_team_member.html.haml b/app/views/team_members/_team_member.html.haml index 5fd8d2465d1..d829a79213c 100644 --- a/app/views/team_members/_team_member.html.haml +++ b/app/views/team_members/_team_member.html.haml @@ -1,5 +1,5 @@ - user = member.user -- allow_admin = can? current_user, :admin_project, @project +- allow_admin = current_user_can_admin_project %li{id: dom_id(user), class: "team_member_row user_#{user.id}"} .row .span4 |