Dont show remove/modify controls for personal project owner

diff --git a/app/models/project.rb b/app/models/project.rb
index 63c3d39..e1f135b 100644 (file)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -414,6 +414,10 @@ class Project < ActiveRecord::Base
     imported
   end
 
+  def personal?
+    !group
+  end
+
   def rename_repo
     old_path_with_namespace = File.join(namespace_dir, path_was)
     new_path_with_namespace = File.join(namespace_dir, path)

diff --git a/app/views/team_members/_team_member.html.haml b/app/views/team_members/_team_member.html.haml
index 63336bf..916cf2e 100644 (file)
--- a/app/views/team_members/_team_member.html.haml
+++ b/app/views/team_members/_team_member.html.haml
@@ -1,14 +1,14 @@
 - user = member.user
-- allow_admin = current_user_can_admin_project
 %li{id: dom_id(user), class: "team_member_row access-#{member.human_access.downcase}"}
   .pull-right
-    - if allow_admin
-      .pull-left
-        = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
-          = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
-         
-      = 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
-        %i.icon-minus.icon-white
+    - if current_user_can_admin_project
+      - unless @project.personal? && user == current_user
+        .pull-left
+          = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
+            = f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
+           
+        = 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
+          %i.icon-minus.icon-white
   = image_tag gravatar_icon(user.email, 32), class: "avatar s32"
   %p
     %strong= user.name

diff --git a/app/views/users_groups/_users_group.html.haml b/app/views/users_groups/_users_group.html.haml
index 31a8299..c6dca5f 100644 (file)
--- a/app/views/users_groups/_users_group.html.haml
+++ b/app/views/users_groups/_users_group.html.haml
@@ -4,6 +4,8 @@
   = image_tag gravatar_icon(user.email, 16), class: "avatar s16"
   %strong= user.name
   %span.cgray= user.username
+  - if user == current_user
+    %span.label.label-success It's you
 
   %span.pull-right
     - if @group.owners.include?(user)