Download as
Browse Code »

Commit c2817e6f3ad38f6437352749303a3c58abeff717

Authored by randx
1 parent 4c1267e0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Team Member Profile: Remove button rebased

Showing 1 changed file with 4 additions and 6 deletions   Show diff stats
app/views/team_members/show.html.haml
  Diff comments   View file @c2817e6
... ... @@ -2,12 +2,15 @@
2 2 - user = @team_member.user
3 3  
4 4 .team_member_show
  5 + - if can? current_user, :admin_project, @project
  6 + = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "right btn btn-danger"
5 7 .profile_avatar_holder
6 8 = image_tag gravatar_icon(user.email, 60), :class => "borders"
7 9 %h3
8 10 = user.name
9 11 %small
10 12 = user.email
  13 +
11 14 %hr
12 15 .back_link
13 16 %br
... ... @@ -48,12 +51,7 @@
48 51 = form_for(@team_member, :as => :team_member, :url => project_team_member_path(@project, @team_member)) do |f|
49 52 = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
50 53 %hr
51   - = render user.recent_events.limit(3)
52   - - if can? current_user, :admin_project, @project
53   - .form-horizontal
54   - .form-actions
55   - = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "btn btn-danger"
56   -
  54 + = render user.recent_events.limit(5)
57 55 :javascript
58 56 $(function(){
59 57 $('.repo-access-select, .project-access-select').live("change", function() {
... ...