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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
18d19fba
Commit
18d19fba
authored
Jun 17, 2019
by
Justin Boyson
Committed by
Mike Greiling
Jun 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport fix MR search by approvers
parent
14546677
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
app/assets/javascripts/filtered_search/constants.js
app/assets/javascripts/filtered_search/constants.js
+2
-0
app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
...ascripts/filtered_search/filtered_search_visual_tokens.js
+1
-1
app/assets/javascripts/filtered_search/visual_token_value.js
app/assets/javascripts/filtered_search/visual_token_value.js
+2
-1
No files found.
app/assets/javascripts/filtered_search/constants.js
0 → 100644
View file @
18d19fba
/* eslint-disable import/prefer-default-export */
export
const
TOKEN_TYPES
=
[
'
author
'
,
'
assignee
'
];
app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
View file @
18d19fba
import
VisualTokenValue
from
'
ee_else_ce/filtered_search
/visual_token_value
'
;
import
VisualTokenValue
from
'
.
/visual_token_value
'
;
import
{
objectToQueryString
}
from
'
~/lib/utils/common_utils
'
;
import
{
objectToQueryString
}
from
'
~/lib/utils/common_utils
'
;
import
FilteredSearchContainer
from
'
./container
'
;
import
FilteredSearchContainer
from
'
./container
'
;
...
...
app/assets/javascripts/filtered_search/visual_token_value.js
View file @
18d19fba
...
@@ -6,6 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
...
@@ -6,6 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
import
Flash
from
'
~/flash
'
;
import
Flash
from
'
~/flash
'
;
import
UsersCache
from
'
~/lib/utils/users_cache
'
;
import
UsersCache
from
'
~/lib/utils/users_cache
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
TOKEN_TYPES
}
from
'
ee_else_ce/filtered_search/constants
'
;
export
default
class
VisualTokenValue
{
export
default
class
VisualTokenValue
{
constructor
(
tokenValue
,
tokenType
)
{
constructor
(
tokenValue
,
tokenType
)
{
...
@@ -22,7 +23,7 @@ export default class VisualTokenValue {
...
@@ -22,7 +23,7 @@ export default class VisualTokenValue {
if
(
tokenType
===
'
label
'
)
{
if
(
tokenType
===
'
label
'
)
{
this
.
updateLabelTokenColor
(
tokenValueContainer
);
this
.
updateLabelTokenColor
(
tokenValueContainer
);
}
else
if
(
tokenType
===
'
author
'
||
tokenType
===
'
assignee
'
)
{
}
else
if
(
TOKEN_TYPES
.
includes
(
tokenType
)
)
{
this
.
updateUserTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
this
.
updateUserTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
}
else
if
(
tokenType
===
'
my-reaction
'
)
{
}
else
if
(
tokenType
===
'
my-reaction
'
)
{
this
.
updateEmojiTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
this
.
updateEmojiTokenAppearance
(
tokenValueContainer
,
tokenValueElement
);
...
...
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