Download as
Browse Code »

Commit 8e737ed54235ba0d296d25bc24f2f00e986c1507

Authored by Dmitriy Zaporozhets
1 parent 93e003aa
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Dont show remove/modify controls for personal project owner

Showing 3 changed files with 14 additions and 8 deletions   Show diff stats
app/models/project.rb
  Diff comments   View file @8e737ed
... ... @@ -414,6 +414,10 @@ class Project < ActiveRecord::Base
414 414 imported
415 415 end
416 416  
  417 + def personal?
  418 + !group
  419 + end
  420 +
417 421 def rename_repo
418 422 old_path_with_namespace = File.join(namespace_dir, path_was)
419 423 new_path_with_namespace = File.join(namespace_dir, path)
... ...
app/views/team_members/_team_member.html.haml
  Diff comments   View file @8e737ed
1 1 - user = member.user
2   -- allow_admin = current_user_can_admin_project
3 2 %li{id: dom_id(user), class: "team_member_row access-#{member.human_access.downcase}"}
4 3 .pull-right
5   - - if allow_admin
6   - .pull-left
7   - = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
8   - = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
9   -  
10   - = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
11   - %i.icon-minus.icon-white
  4 + - if current_user_can_admin_project
  5 + - unless @project.personal? && user == current_user
  6 + .pull-left
  7 + = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
  8 + = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
  9 +  
  10 + = link_to project_team_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
  11 + %i.icon-minus.icon-white
12 12 = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
13 13 %p
14 14 %strong= user.name
... ...
app/views/users_groups/_users_group.html.haml
  Diff comments   View file @8e737ed
... ... @@ -4,6 +4,8 @@
4 4 = image_tag gravatar_icon(user.email, 16), class: "avatar s16"
5 5 %strong= user.name
6 6 %span.cgray= user.username
  7 + - if user == current_user
  8 + %span.label.label-success It's you
7 9  
8 10 %span.pull-right
9 11 - if @group.owners.include?(user)
... ...