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
ca430d24
Commit
ca430d24
authored
Mar 02, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `isGroupDecendent` to init config
parent
e4ec50b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
...ripts/filtered_search/filtered_search_dropdown_manager.js
+2
-0
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+2
-0
app/assets/javascripts/pages/search/init_filtered_search.js
app/assets/javascripts/pages/search/init_filtered_search.js
+2
-0
No files found.
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
View file @
ca430d24
...
@@ -16,6 +16,7 @@ export default class FilteredSearchDropdownManager {
...
@@ -16,6 +16,7 @@ export default class FilteredSearchDropdownManager {
page
,
page
,
isGroup
,
isGroup
,
isGroupAncestor
,
isGroupAncestor
,
isGroupDecendent
,
filteredSearchTokenKeys
,
filteredSearchTokenKeys
,
})
{
})
{
this
.
container
=
FilteredSearchContainer
.
container
;
this
.
container
=
FilteredSearchContainer
.
container
;
...
@@ -26,6 +27,7 @@ export default class FilteredSearchDropdownManager {
...
@@ -26,6 +27,7 @@ export default class FilteredSearchDropdownManager {
this
.
page
=
page
;
this
.
page
=
page
;
this
.
groupsOnly
=
isGroup
;
this
.
groupsOnly
=
isGroup
;
this
.
groupAncestor
=
isGroupAncestor
;
this
.
groupAncestor
=
isGroupAncestor
;
this
.
isGroupDecendent
=
isGroupDecendent
;
this
.
setupMapping
();
this
.
setupMapping
();
...
...
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
ca430d24
...
@@ -22,11 +22,13 @@ export default class FilteredSearchManager {
...
@@ -22,11 +22,13 @@ export default class FilteredSearchManager {
page
,
page
,
isGroup
=
false
,
isGroup
=
false
,
isGroupAncestor
=
false
,
isGroupAncestor
=
false
,
isGroupDecendent
=
false
,
filteredSearchTokenKeys
=
FilteredSearchTokenKeys
,
filteredSearchTokenKeys
=
FilteredSearchTokenKeys
,
stateFiltersSelector
=
'
.issues-state-filters
'
,
stateFiltersSelector
=
'
.issues-state-filters
'
,
})
{
})
{
this
.
isGroup
=
isGroup
;
this
.
isGroup
=
isGroup
;
this
.
isGroupAncestor
=
isGroupAncestor
;
this
.
isGroupAncestor
=
isGroupAncestor
;
this
.
isGroupDecendent
=
isGroupDecendent
;
this
.
states
=
[
'
opened
'
,
'
closed
'
,
'
merged
'
,
'
all
'
];
this
.
states
=
[
'
opened
'
,
'
closed
'
,
'
merged
'
,
'
all
'
];
this
.
page
=
page
;
this
.
page
=
page
;
...
...
app/assets/javascripts/pages/search/init_filtered_search.js
View file @
ca430d24
...
@@ -5,6 +5,7 @@ export default ({
...
@@ -5,6 +5,7 @@ export default ({
filteredSearchTokenKeys
,
filteredSearchTokenKeys
,
isGroup
,
isGroup
,
isGroupAncestor
,
isGroupAncestor
,
isGroupDecendent
,
stateFiltersSelector
,
stateFiltersSelector
,
})
=>
{
})
=>
{
const
filteredSearchEnabled
=
FilteredSearchManager
&&
document
.
querySelector
(
'
.filtered-search
'
);
const
filteredSearchEnabled
=
FilteredSearchManager
&&
document
.
querySelector
(
'
.filtered-search
'
);
...
@@ -13,6 +14,7 @@ export default ({
...
@@ -13,6 +14,7 @@ export default ({
page
,
page
,
isGroup
,
isGroup
,
isGroupAncestor
,
isGroupAncestor
,
isGroupDecendent
,
filteredSearchTokenKeys
,
filteredSearchTokenKeys
,
stateFiltersSelector
,
stateFiltersSelector
,
});
});
...
...
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