diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 11:04:42 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 11:04:42 +0000 |
| commit | f28bbf9468458864ad5e883c48309a40ea99b63a (patch) | |
| tree | 5dae2fbe84e163b8c461d3a6f21d8fe4fcda1707 /app | |
| parent | 3a857e0e6c9460692f4b5d61e634205da9dee63a (diff) | |
| parent | aa35abf9bf7ad528369bd8b54796f38cf68dfd96 (diff) | |
| download | gitlab-ce-f28bbf9468458864ad5e883c48309a40ea99b63a.tar.gz | |
Merge branch 'project-move-dropdown-search' into 'master'
Fixed issue with move dropdown not being searchable
## What does this MR do?
Adds the ability to search the project move dropdown.
## What are the relevant issue numbers?
Closes #18634
## Screenshots (if relevant)
See merge request !4666
Diffstat (limited to 'app')
| -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 |