kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Resolve CE/EE diffs in dropdown_user

Closes gitlab-ee#10494

See merge request gitlab-org/gitlab-ce!28577
This commit is contained in:
Phil Hughes 2019-05-22 07:48:02 +00:00
commit 42e564c6b2
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/filtered_search/dropdown_user.js
View file

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