From d23fbbc6928983582198092cf28a0cd46d30252f Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Sat, 21 Jul 2018 10:11:07 +0200 Subject: Build noteables in AutocompleteSourcesController#target --- app/controllers/projects/autocomplete_sources_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects/autocomplete_sources_controller.rb') diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb index 07627ffb69f..eaaac5ca940 100644 --- a/app/controllers/projects/autocomplete_sources_controller.rb +++ b/app/controllers/projects/autocomplete_sources_controller.rb @@ -34,9 +34,9 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController def target case params[:type]&.downcase when 'issue' - IssuesFinder.new(current_user, project_id: @project.id).find_by(iid: params[:type_id]) + 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]) + 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 -- cgit v1.2.1 From 9b95fe78ae39aa2c0f9c3dc49b897097fc3fef5e Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Sat, 28 Jul 2018 23:42:06 +0200 Subject: Move finding autocompletion targets into AutocompleteService --- app/controllers/projects/autocomplete_sources_controller.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'app/controllers/projects/autocomplete_sources_controller.rb') diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb index eaaac5ca940..6e3edb31b99 100644 --- a/app/controllers/projects/autocomplete_sources_controller.rb +++ b/app/controllers/projects/autocomplete_sources_controller.rb @@ -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 -- cgit v1.2.1 From 82337dd684d88ec38285d51cfb1180b1a1057b95 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Thu, 9 Aug 2018 11:04:12 +0200 Subject: Implement QuickActions::TargetService --- app/controllers/projects/autocomplete_sources_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects/autocomplete_sources_controller.rb') diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb index 6e3edb31b99..a8f73ed5cb0 100644 --- a/app/controllers/projects/autocomplete_sources_controller.rb +++ b/app/controllers/projects/autocomplete_sources_controller.rb @@ -1,5 +1,5 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController - before_action :load_autocomplete_service + before_action :load_autocomplete_service, except: [:members] def members render json: ::Projects::ParticipantsService.new(@project, current_user).execute(target) @@ -32,6 +32,8 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController end def target - @autocomplete_service.target(params[:type], params[:type_id]) + QuickActions::TargetService + .new(project, current_user) + .execute(params[:type], params[:type_id]) end end -- cgit v1.2.1