Merge pull request gitlabhq#4163 from jdamick/slow_team_list

addresses issue #4156
dyarnell · Jun 6, 2013 · 978bc81 · 978bc81
2 parents 66c8176 + 63968c1
commit 978bc81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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