root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Move finding autocompletion targets into AutocompleteService

This commit is contained in:
Peter Leitzen 2018-07-28 23:42:06 +02:00
parent 19f97d2a0f
commit 9b95fe78ae
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/projects/autocomplete_sources_controller.rb
View File

@ -1,5 +1,5 @@
class Projects::AutocompleteSourcesController < Projects::ApplicationController
before_action :load_autocomplete_service, except: [:members]
before_action :load_autocomplete_service
def members
render json: ::Projects::ParticipantsService.new(@project, current_user).execute(target)
@ -32,13 +32,6 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
end
def target
case params[:type]&.downcase
when 'issue'
IssuesFinder.new(current_user, project_id: @project.id).find_by(iid: params[:type_id]) || @project.issues.build
when 'mergerequest'
MergeRequestsFinder.new(current_user, project_id: @project.id).find_by(iid: params[:type_id]) || @project.merge_requests.build
when 'commit'
@project.commit(params[:type_id])
end
@autocomplete_service.target(params[:type], params[:type_id])
end
end

11
app/services/projects/autocomplete_service.rb
View File

@ -51,5 +51,16 @@ module Projects
QuickActions::InterpretService.new(project, current_user).available_commands(noteable)
end
def target(type, type_id)
case type&.downcase
when 'issue'
IssuesFinder.new(current_user, project_id: project.id).find_by(iid: type_id) || project.issues.build
when 'mergerequest'
MergeRequestsFinder.new(current_user, project_id: project.id).find_by(iid: type_id) || project.merge_requests.build
when 'commit'
project.commit(type_id)
end
end
end
end