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
d84a42bd
Commit
d84a42bd
authored
Oct 05, 2017
by
Simon Knox
Committed by
Oswaldo Ferreira
Oct 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only hide board config labels
parent
cb61fd1d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
app/assets/javascripts/boards/boards_bundle.js
app/assets/javascripts/boards/boards_bundle.js
+8
-2
app/assets/javascripts/boards/filtered_search_boards.js
app/assets/javascripts/boards/filtered_search_boards.js
+6
-2
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+1
-1
No files found.
app/assets/javascripts/boards/boards_bundle.js
View file @
d84a42bd
...
...
@@ -87,7 +87,10 @@ $(() => {
Store
.
filter
.
path
=
[
querystring
].
concat
(
Store
.
filter
.
path
.
split
(
'
&
'
).
filter
(
param
=>
param
.
match
(
new
RegExp
(
`^
${
key
}
=(.*)$`
,
'
g
'
))
===
null
)
).
join
(
'
&
'
);
this
.
cantEdit
.
push
(
tokenName
);
this
.
cantEdit
.
push
({
tokenName
,
value
,
});
};
updateFilterPath
(
'
milestone_title
'
,
this
.
milestoneTitle
,
'
milestone
'
);
...
...
@@ -104,7 +107,10 @@ $(() => {
filterPath
.
push
(
param
);
}
this
.
cantEdit
.
push
(
'
label
'
);
this
.
cantEdit
.
push
({
tokenName
:
'
label
'
,
value
:
label
.
title
,
});
});
Store
.
filter
.
path
=
filterPath
.
join
(
'
&
'
);
...
...
app/assets/javascripts/boards/filtered_search_boards.js
View file @
d84a42bd
...
...
@@ -12,6 +12,7 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
// instead or reloading the page, we just re-fire the list ajax requests
this
.
isHandledAsync
=
true
;
this
.
cantEdit
=
cantEdit
;
this
.
hiddenTokenNames
=
cantEdit
.
map
(
i
=>
i
.
tokenName
);
}
updateObject
(
path
)
{
...
...
@@ -42,7 +43,10 @@ export default class FilteredSearchBoards extends gl.FilteredSearchManager {
this
.
filteredSearchInput
.
dispatchEvent
(
new
Event
(
'
input
'
));
}
canEdit
(
tokenName
)
{
return
this
.
cantEdit
.
indexOf
(
tokenName
)
===
-
1
;
canEdit
(
tokenName
,
tokenValue
)
{
if
(
tokenValue
&&
this
.
hiddenTokenNames
.
includes
(
tokenName
))
{
return
this
.
cantEdit
.
findIndex
(
i
=>
i
.
tokenName
===
tokenName
&&
i
.
value
===
tokenValue
)
===
-
1
;
}
return
this
.
hiddenTokenNames
.
indexOf
(
tokenName
)
===
-
1
;
}
}
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
d84a42bd
...
...
@@ -481,7 +481,7 @@ class FilteredSearchManager {
}
hasFilteredSearch
=
true
;
const
canEdit
=
this
.
canEdit
&&
this
.
canEdit
(
sanitizedKey
);
const
canEdit
=
this
.
canEdit
&&
this
.
canEdit
(
sanitizedKey
,
sanitizedValue
);
gl
.
FilteredSearchVisualTokens
.
addFilterVisualToken
(
sanitizedKey
,
`
${
symbol
}${
quotationsToUse
}${
sanitizedValue
}${
quotationsToUse
}
`
,
...
...
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