Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kumanyaev <me@zzet.org>2013-01-23 02:20:27 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-25 00:31:25 +0400
commit18bd1c9d30e16783d750c7786cbcc7d350f4d0aa (patch)
tree6218758f723e827cf90ea61f7bc4ed639ad6cc54 /app/views/teams/members/_show.html.haml
parent7658f8c151b22680cf594d028e180a8a859fc9b8 (diff)
update all teams code. refactoring and some corrections
Diffstat (limited to 'app/views/teams/members/_show.html.haml')
-rw-r--r--app/views/teams/members/_show.html.haml14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/teams/members/_show.html.haml b/app/views/teams/members/_show.html.haml
index a06d269ac00..ec4728787cf 100644
--- a/app/views/teams/members/_show.html.haml
+++ b/app/views/teams/members/_show.html.haml
@@ -1,11 +1,11 @@
- user = member.user
-- allow_admin = can? current_user, :manage_user_team, @user_team
+- allow_admin = can? current_user, :manage_user_team, @team
%li{id: dom_id(member), class: "team_member_row user_#{user.id}"}
.row
.span5
- = link_to team_member_path(@user_team, user), title: user.name, class: "dark" do
+ = link_to team_member_path(@team, user), title: user.name, class: "dark" do
= image_tag gravatar_icon(user.email, 40), class: "avatar s32"
- = link_to team_member_path(@user_team, user), title: user.name, class: "dark" do
+ = link_to team_member_path(@team, user), title: user.name, class: "dark" do
%strong= truncate(user.name, lenght: 40)
%br
%small.cgray= user.email
@@ -13,8 +13,8 @@
.span6.right
- if allow_admin
.left.span2
- = form_for(member, as: :team_member, url: team_member_path(@user_team, user)) do |f|
- = f.select :permission, options_for_select(UsersProject.access_roles, @user_team.default_projects_access(user)), {}, class: "medium project-access-select span2"
+ = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
+ = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium project-access-select span2"
.left.span2
%span
Admin access
@@ -22,10 +22,10 @@
.right
- if current_user == user
%span.btn.disabled This is you!
- - if @user_team.owner == user
+ - if @team.owner == user
%span.btn.disabled.success Owner
- elsif user.blocked
%span.btn.disabled.blocked Blocked
- elsif allow_admin
- = link_to team_member_path(@user_team, user), confirm: remove_from_user_team_message(@user_team, user), method: :delete, class: "very_small btn danger" do
+ = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "very_small btn danger" do
%i.icon-minus.icon-white