diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-11-19 14:49:35 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-11-20 13:49:24 +0100 |
commit | 5a4c56c38dd7aef414582edb880b343bf67b65b8 (patch) | |
tree | 6632ba1960f6ff9ba3ca6c461d3a39670f996e43 /app/controllers/autocomplete_controller.rb | |
parent | 347f136229b19994f2e52b936dc6136cde0c9133 (diff) | |
download | gitlab-ce-5a4c56c38dd7aef414582edb880b343bf67b65b8.tar.gz |
Reduce method complexity in AutocompleteControlleree-flog
Diffstat (limited to 'app/controllers/autocomplete_controller.rb')
-rw-r--r-- | app/controllers/autocomplete_controller.rb | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 202e9da9eee..aa0268b8d62 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -1,34 +1,8 @@ class AutocompleteController < ApplicationController skip_before_action :authenticate_user!, only: [:users] + before_action :find_users, only: [:users] def users - begin - @users = - if params[:project_id].present? - project = Project.find(params[:project_id]) - - if can?(current_user, :read_project, project) - project.team.users - end - elsif params[:group_id] - group = Group.find(params[:group_id]) - - if can?(current_user, :read_group, group) - group.users - end - elsif current_user - User.all - end - rescue ActiveRecord::RecordNotFound - if current_user - return render json: {}, status: 404 - end - end - - if @users.nil? && current_user.nil? - authenticate_user! - end - @users ||= User.none @users = @users.search(params[:search]) if params[:search].present? @users = @users.active @@ -49,4 +23,25 @@ class AutocompleteController < ApplicationController @user = User.find(params[:id]) render json: @user, only: [:name, :username, :id], methods: [:avatar_url] end + + private + + def find_users + @users = + if params[:project_id].present? + project = Project.find(params[:project_id]) + return render_404 unless can?(current_user, :read_project, project) + + project.team.users + elsif params[:group_id].present? + group = Group.find(params[:group_id]) + return render_404 unless can?(current_user, :read_group, group) + + group.users + elsif current_user + User.all + else + User.none + end + end end |