Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
d0bb69c0
Commit
d0bb69c0
authored
May 22, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in dropdown_user
Part of single codebase changes.
parent
e63b65cd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
+14
-0
app/assets/javascripts/filtered_search/dropdown_user.js
app/assets/javascripts/filtered_search/dropdown_user.js
+14
-0
No files found.
app/assets/javascripts/filtered_search/dropdown_user.js
View file @
d0bb69c0
...
@@ -18,6 +18,7 @@ export default class DropdownUser extends DropdownAjaxFilter {
...
@@ -18,6 +18,7 @@ export default class DropdownUser extends DropdownAjaxFilter {
group_id
:
this
.
getGroupId
(),
group_id
:
this
.
getGroupId
(),
project_id
:
this
.
getProjectId
(),
project_id
:
this
.
getProjectId
(),
current_user
:
true
,
current_user
:
true
,
...
this
.
projectOrGroupId
(),
},
},
onLoadingFinished
:
()
=>
{
onLoadingFinished
:
()
=>
{
this
.
hideCurrentUser
();
this
.
hideCurrentUser
();
...
@@ -36,4 +37,17 @@ export default class DropdownUser extends DropdownAjaxFilter {
...
@@ -36,4 +37,17 @@ export default class DropdownUser extends DropdownAjaxFilter {
getProjectId
()
{
getProjectId
()
{
return
this
.
input
.
getAttribute
(
'
data-project-id
'
);
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
,
};
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment