summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-15 09:20:33 +0000
committerPhil Hughes <me@iamphill.com>2017-09-15 09:20:33 +0000
commit2203e8fc35b12c19a9a0be1c2c63256047a3c5ff (patch)
tree183eb0f4b3241ea85bb77bb2e079919b2ce32622 /app/assets/javascripts
parente3f942e1d9f95918c71fc128600eb31c46b723a2 (diff)
parentb06d5b963a11ad695a8d0d0db75480e2290b155f (diff)
downloadgitlab-ce-2203e8fc35b12c19a9a0be1c2c63256047a3c5ff.tar.gz
Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'
Resolve "Scope users by group inside dropdowns if I'm on group page (Issue, MRs)" Closes #20824 See merge request gitlab-org/gitlab-ce!14249
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/filtered_search/dropdown_user.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_user.js b/app/assets/javascripts/filtered_search/dropdown_user.js
index 7246ccbb281..720fbc87ea0 100644
--- a/app/assets/javascripts/filtered_search/dropdown_user.js
+++ b/app/assets/javascripts/filtered_search/dropdown_user.js
@@ -15,6 +15,7 @@ class DropdownUser extends gl.FilteredSearchDropdown {
params: {
per_page: 20,
active: true,
+ group_id: this.getGroupId(),
project_id: this.getProjectId(),
current_user: true,
},
@@ -47,6 +48,10 @@ class DropdownUser extends gl.FilteredSearchDropdown {
super.renderContent(forceShowList);
}
+ getGroupId() {
+ return this.input.getAttribute('data-group-id');
+ }
+
getProjectId() {
return this.input.getAttribute('data-project-id');
}