From 80073da95771fc51a4ac05814b0a7ceae1cbdac9 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 17 Nov 2016 11:13:39 +0000 Subject: Include author in assignee dropdown search When searching for the author in the assignee dropdown it now correctly returns the user Closes #22905 --- app/controllers/autocomplete_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index daa82336208..fcfa508128e 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -55,7 +55,13 @@ class AutocompleteController < ApplicationController def find_users @users = if @project - @project.team.users + user_ids = @project.team.users.map(&:id) + + if params[:author_id].present? + user_ids << params[:author_id] + end + + User.where(id: user_ids) elsif params[:group_id].present? group = Group.find(params[:group_id]) return render_404 unless can?(current_user, :read_group, group) -- cgit v1.2.1