From 84371de01f3ce7bab334539a93734658528736ec Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Mar 2015 16:28:33 +0100
Subject: [PATCH] Move group leave action from dashboard/groups to
 groups/group_members.

---
 app/controllers/dashboard/groups_controller.rb | 18 +-----------------
 .../groups/group_members_controller.rb         | 11 +++++++++++
 app/views/dashboard/groups/index.html.haml     |  2 +-
 .../group_members/_group_member.html.haml      |  5 +++--
 config/routes.rb                               |  7 ++-----
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb
index b827639978c..ed14f4e1f3b 100644
--- a/app/controllers/dashboard/groups_controller.rb
+++ b/app/controllers/dashboard/groups_controller.rb
@@ -1,21 +1,5 @@
 class Dashboard::GroupsController < ApplicationController
   def index
-    @user_groups = current_user.group_members.page(params[:page]).per(PER_PAGE)
-  end
-
-  def leave
-    @users_group = group.group_members.where(user_id: current_user.id).first
-    if can?(current_user, :destroy, @users_group)
-      @users_group.destroy
-      redirect_to(dashboard_groups_path, info: "You left #{group.name} group.")
-    else
-      return render_403
-    end
-  end
-
-  private
-
-  def group
-    @group ||= Group.find_by(path: params[:id])
+    @group_members = current_user.group_members.page(params[:page]).per(PER_PAGE)
   end
 end
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index d3d6ce1ca2c..2df51c97a22 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -46,6 +46,17 @@ class Groups::GroupMembersController < Groups::ApplicationController
     end
   end
 
+  def leave
+    @group_member = @group.group_members.where(user_id: current_user.id).first
+    
+    if can?(current_user, :destroy_group_member, @group_member)
+      @group_member.destroy
+      redirect_to(dashboard_groups_path, info: "You left #{group.name} group.")
+    else
+      return render_403
+    end
+  end
+
   protected
 
   def group
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 76f7d660f36..165db214d75 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -23,7 +23,7 @@
               Settings
 
           - if can?(current_user, :destroy_group_member, group_member)
-            = link_to leave_dashboard_group_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Remove user from group' do
+            = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Remove user from group' do
               %i.fa.fa-sign-out
               Leave
 
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml
index 2fc91df0931..3d120c5cdd7 100644
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -1,6 +1,7 @@
 - user = member.user
 - return unless user
 - show_roles = true if show_roles.nil?
+
 %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
   %span{class: ("list-item-name" if show_controls)}
     = image_tag avatar_icon(user.email, 16), class: "avatar s16"
@@ -21,8 +22,8 @@
                        title: 'Edit access level', type: 'button' do
             %i.fa.fa-pencil-square-o
         - if can?(current_user, :destroy_group_member, member)
-          - if current_user == member.user
-            = link_to leave_dashboard_group_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
+          - if current_user == user
+            = link_to leave_group_group_members_path(@group), data: { confirm: leave_group_message(@group.name)}, method: :delete, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
               %i.fa.fa-minus.fa-inverse
           - else
             = link_to group_group_member_path(@group, member), data: { confirm: remove_user_from_group_message(@group, user) }, method: :delete, remote: true, class: "btn-xs btn btn-remove", title: 'Remove user from group' do
diff --git a/config/routes.rb b/config/routes.rb
index 459158dcb61..dd70ad2fa0d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -215,11 +215,7 @@ Gitlab::Application.routes.draw do
     scope module: :dashboard do
       resources :milestones, only: [:index, :show]
 
-      resources :groups, only: [:index] do
-        member do
-          delete :leave
-        end
-      end
+      resources :groups, only: [:index]
 
       resources :projects, only: [] do
         collection do
@@ -241,6 +237,7 @@ Gitlab::Application.routes.draw do
 
     scope module: :groups do
       resources :group_members, only: [:index, :create, :update, :destroy] do
+        delete :leave, on: :collection
       end
       
       resource :avatar, only: [:destroy]