Commit 5b36687b authored by Phil Hughes's avatar Phil Hughes

Added milestone & label filtering

Currently a bug exists with label filtering...
parent fce8ee3e
...@@ -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 () {
......
...@@ -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'));
......
...@@ -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 {
......
...@@ -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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment