summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/labels_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/labels_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/labels_select.js')
-rw-r--r--app/assets/javascripts/labels_select.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index 1bb0b67d0e8..d3bee457619 100644
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -300,7 +300,10 @@
page = $('body').data('page');
isIssueIndex = page === 'projects:issues: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')) {
selectedLabel = label.title;
return Issuable.filterResults($dropdown.closest('form'));