kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Refactor groups/projects members controller 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2016-10-19 17:27:28 +03:00
parent 036fac06d1
commit c82278898d
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/groups/group_members_controller.rb
View File

@ -21,7 +21,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
end
def create
if params[:user_ids].empty?
if params[:user_ids].blank?
return redirect_to group_group_members_path(@group), alert: 'No users specified.'
end

18
app/controllers/projects/project_members_controller.rb
View File

@ -25,16 +25,18 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
def create
if params[:user_ids].empty?
return redirect_to namespace_project_project_members_path(@project.namespace, @project), alert: 'No users specified.'
if params[:user_ids].blank? && params[:group_ids].blank?
return redirect_to namespace_project_project_members_path(@project.namespace, @project), alert: 'No users or groups specified.'
end
@project.team.add_users(
params[:user_ids].split(','),
params[:access_level],
expires_at: params[:expires_at],
current_user: current_user
)
if params[:user_ids].present?
@project.team.add_users(
params[:user_ids].split(','),
params[:access_level],
expires_at: params[:expires_at],
current_user: current_user
)
end
redirect_to namespace_project_project_members_path(@project.namespace, @project), notice: 'Users were successfully added.'
end