diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-15 08:53:11 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-15 08:53:11 +0100 |
| commit | e412c1f25e9abfebaa7b5669e1acf7f26a66d722 (patch) | |
| tree | b04bbd5277399d66a974a0ae38e46578bb3f9295 | |
| parent | bf4455d14659f1fde6391164b38310d361bf407d (diff) | |
| download | gitlab-ce-project-move-dropdown-search.tar.gz | |
Fixed issue with move dropdown not being searchableproject-move-dropdown-search
Closes #18634
| -rw-r--r-- | app/assets/javascripts/issuable_form.js.coffee | 4 | ||||
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/issuable_form.js.coffee b/app/assets/javascripts/issuable_form.js.coffee index 898506fde32..5b7a4831dfc 100644 --- a/app/assets/javascripts/issuable_form.js.coffee +++ b/app/assets/javascripts/issuable_form.js.coffee @@ -102,6 +102,10 @@ class @IssuableForm return { results: data } + data: (query) -> + { + search: query + } formatResult: (project) -> project.name_with_namespace formatSelection: (project) -> diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 3865b2d61fd..c89678cf2d8 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -35,6 +35,7 @@ class AutocompleteController < ApplicationController project = Project.find_by_id(params[:project_id]) projects = current_user.authorized_projects + projects = projects.search(params[:search]) if params[:search].present? projects = projects.select do |project| current_user.can?(:admin_issue, project) end |