summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/milestone_select.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-05 15:42:27 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:12:47 +0100
commit5b36687b9e9c0153ddd233b2b97f723d50ad384b (patch)
treefd2766cbbd04fb2f5886dbddc08ae93322f4222c /app/assets/javascripts/milestone_select.js
parentfce8ee3e54d35094cb393096caffd90707deeb71 (diff)
downloadgitlab-ce-5b36687b9e9c0153ddd233b2b97f723d50ad384b.tar.gz
Added milestone & label filtering
Currently a bug exists with label filtering...
Diffstat (limited to 'app/assets/javascripts/milestone_select.js')
-rw-r--r--app/assets/javascripts/milestone_select.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js
index a0b65d20c03..b14bef73da4 100644
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -102,7 +102,9 @@
if ($dropdown.hasClass('js-filter-bulk-update')) {
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) {
selectedMilestone = selected.name;
} else {