diff options
author | Luke Bennett <lbennett@gitlab.com> | 2019-05-22 04:08:30 +0100 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2019-05-22 04:08:30 +0100 |
commit | d0bb69c02aa9bfb67308b367f105c85eacd47c78 (patch) | |
tree | 0ea8c654898817d76714e8df17acf4f8c5c040a4 | |
parent | e63b65cd4f5d8298cb0441a5e0e5a0321f739367 (diff) | |
download | gitlab-ce-d0bb69c02aa9bfb67308b367f105c85eacd47c78.tar.gz |
Resolve CE/EE diffs in dropdown_user
Part of single codebase changes.
-rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_user.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js index f1e7be6bde1..a65c0012b4d 100644 --- a/app/assets/javascripts/filtered_search/dropdown_user.js +++ b/app/assets/javascripts/filtered_search/dropdown_user.js @@ -18,6 +18,7 @@ export default class DropdownUser extends DropdownAjaxFilter { group_id: this.getGroupId(), project_id: this.getProjectId(), current_user: true, + ...this.projectOrGroupId(), }, onLoadingFinished: () => { this.hideCurrentUser(); @@ -36,4 +37,17 @@ export default class DropdownUser extends DropdownAjaxFilter { getProjectId() { return this.input.getAttribute('data-project-id'); } + + projectOrGroupId() { + const projectId = this.getProjectId(); + const groupId = this.getGroupId(); + if (groupId) { + return { + group_id: groupId, + }; + } + return { + project_id: projectId, + }; + } } |