Commit d377e94b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'refactoring_group_controllers' into 'master'

Group controllers refactoring

Usefulness of this refactoring is not so obvious on CE codebase. But It will allow us to remove huge amount of code on the EE side.

See merge request !1684
parents 3f823068 0b38c3e0
class Groups::ApplicationController < ApplicationController
private
def authorize_admin_group!
unless can?(current_user, :manage_group, group)
return render_404
end
end
end
class Groups::GroupMembersController < ApplicationController class Groups::GroupMembersController < Groups::ApplicationController
before_filter :group before_filter :group
# Authorize # Authorize
...@@ -37,12 +37,6 @@ class Groups::GroupMembersController < ApplicationController ...@@ -37,12 +37,6 @@ class Groups::GroupMembersController < ApplicationController
@group ||= Group.find_by(path: params[:group_id]) @group ||= Group.find_by(path: params[:group_id])
end end
def authorize_admin_group!
unless can?(current_user, :manage_group, group)
return render_404
end
end
def member_params def member_params
params.require(:group_member).permit(:access_level, :user_id) params.require(:group_member).permit(:access_level, :user_id)
end end
......
class GroupsController < ApplicationController class GroupsController < Groups::ApplicationController
skip_before_filter :authenticate_user!, only: [:show, :issues, :members, :merge_requests] skip_before_filter :authenticate_user!, only: [:show, :issues, :members, :merge_requests]
respond_to :html respond_to :html
before_filter :group, except: [:new, :create] before_filter :group, except: [:new, :create]
...@@ -132,12 +132,6 @@ class GroupsController < ApplicationController ...@@ -132,12 +132,6 @@ class GroupsController < ApplicationController
end end
end end
def authorize_admin_group!
unless can?(current_user, :manage_group, group)
return render_404
end
end
def set_title def set_title
@title = 'New Group' @title = 'New Group'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment