diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-10 18:30:28 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-10 18:30:28 +0300 |
| commit | e99559260bbfe495e8bf5a22ba86e0ec4f1e31ed (patch) | |
| tree | e08faf520d849ff2aedc1ef7586e2cf35c9ed5e3 /app/assets/javascripts | |
| parent | 2e7e2b534907b7095e20edeca30c99c18ea436af (diff) | |
| parent | a4b3bdabd52494f46fee73271d7b343e6b7e08e9 (diff) | |
Merge branch 'user-search-dropdown' into 'master'
Revert change to search all users
## What does this MR do?
Reverts a change that allowed the user to search for all users in the author/assignee dropdown
## Are there points in the code the reviewer needs to double check?
Double check it isn't still searching all users
See merge request !4564
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index de0eae58bff..88246b0feb8 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -95,7 +95,7 @@ class @UsersSelect data: (term, callback) => isAuthorFilter = $('.js-author-search') - @users term, term is '' and isAuthorFilter, (users) => + @users term, (users) => if term.length is 0 showDivider = 0 @@ -221,7 +221,7 @@ class @UsersSelect multiple: $(select).hasClass('multiselect') minimumInputLength: 0 query: (query) => - @users query.term, @projectId?, (users) => + @users query.term, (users) => data = { results: users } if query.term.length == 0 @@ -304,7 +304,7 @@ class @UsersSelect # Return users list. Filtered by query # Only active users retrieved - users: (query, fromProject, callback) => + users: (query, callback) => url = @buildUrl(@usersPath) $.ajax( @@ -313,7 +313,7 @@ class @UsersSelect search: query per_page: 20 active: true - project_id: @projectId if fromProject + project_id: @projectId group_id: @groupId current_user: @showCurrentUser author_id: @authorId |