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
d5ab9895
Commit
d5ab9895
authored
Oct 05, 2017
by
Simon Knox
Committed by
Oswaldo Ferreira
Oct 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix lint
parent
d84a42bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/boards_bundle.js
+2
-2
app/assets/javascripts/boards/filtered_search_boards.js
app/assets/javascripts/boards/filtered_search_boards.js
+3
-2
No files found.
app/assets/javascripts/boards/boards_bundle.js
View file @
d5ab9895
...
...
@@ -88,7 +88,7 @@ $(() => {
Store
.
filter
.
path
.
split
(
'
&
'
).
filter
(
param
=>
param
.
match
(
new
RegExp
(
`^
${
key
}
=(.*)$`
,
'
g
'
))
===
null
)
).
join
(
'
&
'
);
this
.
cantEdit
.
push
({
tokenName
,
name
:
tokenName
,
value
,
});
};
...
...
@@ -108,7 +108,7 @@ $(() => {
}
this
.
cantEdit
.
push
({
tokenN
ame
:
'
label
'
,
n
ame
:
'
label
'
,
value
:
label
.
title
,
});
});
...
...
app/assets/javascripts/boards/filtered_search_boards.js
View file @
d5ab9895
...
...
@@ -44,8 +44,9 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
}
canEdit
(
tokenName
,
tokenValue
)
{
if
(
tokenValue
&&
this
.
hiddenTokenNames
.
includes
(
tokenName
))
{
return
this
.
cantEdit
.
findIndex
(
i
=>
i
.
tokenName
===
tokenName
&&
i
.
value
===
tokenValue
)
===
-
1
;
// only hide tokens if both name and value match. This allows mix of hidden and visible Label tokens
if
(
tokenValue
)
{
return
this
.
cantEdit
.
findIndex
(
t
=>
t
.
name
===
tokenName
&&
t
.
value
===
tokenValue
)
===
-
1
;
}
return
this
.
hiddenTokenNames
.
indexOf
(
tokenName
)
===
-
1
;
}
...
...
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