From c82278898d4e7932da1e0071d4dcfa13f65967f0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Oct 2016 17:27:28 +0300 Subject: [PATCH] Refactor groups/projects members controller Signed-off-by: Dmitriy Zaporozhets --- .../groups/group_members_controller.rb | 2 +- .../projects/project_members_controller.rb | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index 3a373e4a946..5a6e26ab8cc 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -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 diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 2bac48c5490..ec8512bbaba 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -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