Merge branch 'improve/user_removal' of /home/git/repositories/gitlab/gitlabhq

app/assets/javascripts/admin.js.coffee

@@ -23,10 +23,16 @@ class Admin
       e.preventDefault()
       $(this).hide()
       modal.show()
-    
+
     $('.change-owner-cancel-link').bind "click", (e) ->
       e.preventDefault()
       modal.hide()
       $('.change-owner-link').show()
+    $('li.users_project').bind 'ajax:success', ->
+      Turbolinks.visit(location.href)
+
+    $('li.users_group').bind 'ajax:success', ->
+      Turbolinks.visit(location.href)
+
 @Admin = Admin

app/controllers/admin/members_controller.rb

-class Admin::MembersController < Admin::ApplicationController
-  def destroy
-    user = User.find_by_username(params[:id])
-    project = Project.find_with_namespace(params[:project_id])
-    project.users_projects.where(user_id: user).first.destroy
-
-    redirect_to :back
-  end
-end

app/controllers/admin/users_controller.rb

@@ -83,9 +83,10 @@ class Admin::UsersController < Admin::ApplicationController
   end
   def destroy
-    if user.personal_projects.count > 0
-      redirect_to admin_users_path, alert: "User is a project owner and can't be removed." and return
-    end
+    # 1. Remove groups where user is the only owner
+    user.solo_owned_groups.map(&:destroy)
+
+    # 2. Remove user with all authored content including personal projects
     user.destroy
     respond_to do |format|

app/models/group.rb

@@ -23,7 +23,7 @@ class Group < Namespace
   end
   def owners
-    @owners ||= (users_groups.owners.map(&:user) << owner)
+    @owners ||= (users_groups.owners.map(&:user) << owner).uniq
   end
   def add_users(user_ids, group_access)

app/models/project_team.rb

@@ -32,7 +32,15 @@ class ProjectTeam
   end
   def find_tm(user_id)
-    project.users_projects.find_by_user_id(user_id)
+    tm = project.users_projects.find_by_user_id(user_id)
+
+    # If user is not in project members
+    # we should check for group membership
+    if group && !tm
+      tm = group.users_groups.find_by_user_id(user_id)
+    end
+
+    tm
   end
   def add_user(user, access)

app/models/user.rb

@@ -135,7 +135,7 @@ class User < ActiveRecord::Base
       # Remove user from all groups
       user.users_groups.find_each do |membership|
         # skip owned resources
-        next if membership.group.owner == user
+        next if membership.group.owners.include?(user)
         return false unless membership.destroy
       end
@@ -376,4 +376,10 @@ class User < ActiveRecord::Base
       self.send("#{attr}=", Sanitize.clean(value)) if value.present?
     end
   end
+
+  def solo_owned_groups
+    @solo_owned_groups ||= owned_groups.select do |group|
+      group.owners == [self]
+    end
+  end
 end

app/views/admin/users/show.html.haml

@@ -7,15 +7,11 @@
     %span.cred (Admin)
   .pull-right
-    = link_to edit_admin_user_path(@user), class: "btn grouped btn-small" do
+    = link_to edit_admin_user_path(@user), class: "btn grouped" do
       %i.icon-edit
       Edit
-    - unless @user == current_user
-      - if @user.blocked?
-        = link_to 'Unblock', unblock_admin_user_path(@user), method: :put, class: "btn grouped btn-small success"
-      - else
-        = link_to 'Block', block_admin_user_path(@user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn grouped btn-small btn-remove"
-      = link_to 'Destroy', [:admin, @user], confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn grouped btn-small btn-remove"
+    - if @user.blocked?
+      = link_to 'Unblock', unblock_admin_user_path(@user), method: :put, class: "btn grouped success"
 %hr
 .row
@@ -63,24 +59,56 @@
             %strong
               = link_to @user.created_by.name, [:admin, @user.created_by]
+    - unless @user == current_user
+      .alert
+        %h4 Block user
+        %br
+        %p Blocking user has the following effects:
+        %ul
+          %li User will not be able to login
+          %li User will not be able to access git repositories
+          %li User will be removed from joined projects and groups
+          %li Personal projects will be left
+          %li Owned groups will be left
+        = link_to 'Block user', block_admin_user_path(@user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-remove"
+
+      .alert.alert-error
+        %h4
+          Remove user
+        %br
+        %p Deleting a user has the following effects:
+        %ul
+          %li All user content like authored issues, snippets, comments will be removed
+          - rp = @user.personal_projects.count
+          - unless rp.zero?
+            %li #{pluralize rp, 'personal project'} will be removed and cannot be restored
+          - if @user.solo_owned_groups.present?
+            %li
+              Next groups with all content will be removed:
+              %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
+        = link_to 'Remove user', [:admin, @user], confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?", method: :delete, class: "btn btn-remove"
+
+  .span6
     - if @user.users_groups.present?
       .ui-box
         .title Groups:
         %ul.well-list
           - @user.users_groups.each do |user_group|
             - group = user_group.group
-            %li
+            %li.users_group
               %strong= link_to group.name, admin_group_path(group)
               .pull-right
                 %span.light= user_group.human_access
-  .span6
+                - unless user_group.owner?
+                  = link_to group_users_group_path(group, user_group), confirm: remove_user_from_group_message(group, @user), method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do
+                    %i.icon-remove.icon-white
     .ui-box
       .title Projects (#{@projects.count})
       %ul.well-list
         - @projects.sort_by(&:name_with_namespace).each do |project|
           - tm = project.team.find_tm(@user.id)
-          %li
+          %li.users_project
             = link_to admin_project_path(project), class: dom_class(project) do
               - if project.namespace
                 = project.namespace.human_name
@@ -94,5 +122,9 @@
                   %span.light Owner
                 - else
                   %span.light= tm.human_access
-                  = link_to admin_project_member_path(project, tm.user), confirm: remove_from_project_team_message(project, @user), method: :delete, class: "btn btn-small btn-remove" do
-                    %i.icon-remove
+
+                  - if tm.respond_to? :project
+                    = link_to project_team_member_path(project, @user), confirm: remove_from_project_team_message(project, @user), remote: true, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from project' do
+                      %i.icon-remove
+
+

config/routes.rb

@@ -89,11 +89,7 @@ Gitlab::Application.routes.draw do
     resource :logs, only: [:show]
     resource :background_jobs, controller: 'background_jobs', only: [:show]
-
-    resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do
-      resources :members, only: [:destroy]
-    end
-
+    resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show]
     root to: "dashboard#index"
   end

lib/gitlab/access.rb

@@ -44,5 +44,9 @@ module Gitlab
     def human_access
       Gitlab::Access.options_with_owner.key(access_field)
     end
+
+    def owner?
+      access_field == OWNER
+    end
   end
 end

spec/routing/admin_routing_spec.rb

@@ -75,13 +75,6 @@ describe Admin::ProjectsController, "routing" do
   end
 end
-#                           DELETE   /admin/projects/:project_id/members/:id(.:format)         admin/projects/members#destroy {id: /[^\/]+/, project_id: /[^\/]+/}
-describe Admin::MembersController, "routing" do
-  it "to #destroy" do
-    delete("/admin/projects/test/members/1").should route_to('admin/members#destroy', project_id: 'test', id: '1')
-  end
-end
-
 # admin_hook_test GET    /admin/hooks/:hook_id/test(.:format) admin/hooks#test
 #     admin_hooks GET    /admin/hooks(.:format)               admin/hooks#index
 #                 POST   /admin/hooks(.:format)               admin/hooks#create