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
Jérome Perrin
gitlab-ce
Commits
5b36687b
Commit
5b36687b
authored
Aug 05, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added milestone & label filtering
Currently a bug exists with label filtering...
parent
fce8ee3e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
6 deletions
+14
-6
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+2
-2
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+4
-1
app/assets/javascripts/milestone_select.js
app/assets/javascripts/milestone_select.js
+3
-1
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+5
-2
No files found.
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @
5b36687b
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
filters: {
filters: {
author_id: null,
author_id: null,
assignee_id: null,
assignee_id: null,
milestone_
id
: null,
milestone_
title
: null,
label: []
label
_name
: []
}
}
},
},
reset: function () {
reset: function () {
...
...
app/assets/javascripts/labels_select.js
View file @
5b36687b
...
@@ -300,7 +300,10 @@
...
@@ -300,7 +300,10 @@
page
=
$
(
'
body
'
).
data
(
'
page
'
);
page
=
$
(
'
body
'
).
data
(
'
page
'
);
isIssueIndex
=
page
===
'
projects:issues:index
'
;
isIssueIndex
=
page
===
'
projects:issues:index
'
;
isMRIndex
=
page
===
'
projects:merge_requests:index
'
;
isMRIndex
=
page
===
'
projects:merge_requests:index
'
;
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
if
(
page
===
'
projects:boards:show
'
)
{
BoardsStore
.
state
.
filters
[
'
label_name
'
]
=
label
.
title
;
return
;
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
if
(
!
$dropdown
.
hasClass
(
'
js-multiselect
'
))
{
if
(
!
$dropdown
.
hasClass
(
'
js-multiselect
'
))
{
selectedLabel
=
label
.
title
;
selectedLabel
=
label
.
title
;
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
return
Issuable
.
filterResults
(
$dropdown
.
closest
(
'
form
'
));
...
...
app/assets/javascripts/milestone_select.js
View file @
5b36687b
...
@@ -102,7 +102,9 @@
...
@@ -102,7 +102,9 @@
if
(
$dropdown
.
hasClass
(
'
js-filter-bulk-update
'
))
{
if
(
$dropdown
.
hasClass
(
'
js-filter-bulk-update
'
))
{
return
;
return
;
}
}
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
if
(
page
===
'
projects:boards:show
'
)
{
BoardsStore
.
state
.
filters
[
$dropdown
.
data
(
'
field-name
'
)]
=
selected
.
name
;
}
else
if
(
$dropdown
.
hasClass
(
'
js-filter-submit
'
)
&&
(
isIssueIndex
||
isMRIndex
))
{
if
(
selected
.
name
!=
null
)
{
if
(
selected
.
name
!=
null
)
{
selectedMilestone
=
selected
.
name
;
selectedMilestone
=
selected
.
name
;
}
else
{
}
else
{
...
...
app/assets/stylesheets/pages/boards.scss
View file @
5b36687b
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
display
:
flex
;
display
:
flex
;
min-height
:
100vh
;
min-height
:
100vh
;
max-height
:
100vh
;
max-height
:
100vh
;
padding-bottom
:
0
;
}
}
.issue-boards-content
{
.issue-boards-content
{
...
@@ -73,6 +74,7 @@
...
@@ -73,6 +74,7 @@
display
:
flex
;
display
:
flex
;
min-width
:
400px
;
min-width
:
400px
;
max-width
:
400px
;
max-width
:
400px
;
margin-bottom
:
25px
;
padding-right
:
(
$gl-padding
/
2
);
padding-right
:
(
$gl-padding
/
2
);
padding-left
:
(
$gl-padding
/
2
);
padding-left
:
(
$gl-padding
/
2
);
}
}
...
@@ -183,9 +185,10 @@
...
@@ -183,9 +185,10 @@
.board-list
{
.board-list
{
-webkit-flex
:
1
;
-webkit-flex
:
1
;
flex
:
1
;
flex
:
1
;
margin
:
0
;
margin
-bottom
:
0
;
padding
:
5px
;
padding
:
5px
;
overflow
:
scroll
;
overflow-y
:
scroll
;
overflow-x
:
hidden
;
}
}
.board-list-loading
{
.board-list-loading
{
...
...
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