Merge pull request #4163 from jdamick/slow_team_list

addresses issue #4156

Merge pull request #4163 from jdamick/slow_team_list
addresses issue #4156
Dmitriy Zaporozhets
2 parents 66c81767 63968c1a
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
app/views/team_members/_team.html.haml
app/views/team_members/_team_member.html.haml
+- 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
 - 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
	1	+- can_admin_project = (can? current_user, :admin_project, @project)
1	2	- team.each do \|access, members\|
2	3	- role = Project.access_options.key(access).pluralize
3	4	.ui-box{class: role.downcase}
...	...	@@ -6,4 +7,4 @@
6	7	%span.light (#{members.size})
7	8	%ul.well-list
8	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
...	...
1	1	- user = member.user
2		-- allow_admin = can? current_user, :admin_project, @project
	2	+- allow_admin = current_user_can_admin_project
3	3	%li{id: dom_id(user), class: "team_member_row user_#{user.id}"}
4	4	.row
5	5	.span4
...	...