Move group leave action from dashboard/groups to groups/group_members.

2 files changed, 12 insertions, 17 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