Merge branch 'dropdown-user-scb' into 'master'

Resolve CE/EE diffs in dropdown_user

Closes gitlab-ee#10494

See merge request gitlab-org/gitlab-ce!28577

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,
+    };
+  }
 }