diff options
author | Phil Hughes <me@iamphill.com> | 2017-02-01 17:02:17 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-02-03 18:03:40 +0000 |
commit | e4d1e1437d43a34656f4343fc53431695742a989 (patch) | |
tree | d83026887abeea5123174dc6151c4cea54fe2259 /app/assets/javascripts/milestone_select.js | |
parent | e6add00cece0d53b7072096e23af82d1804b8342 (diff) | |
download | gitlab-ce-e4d1e1437d43a34656f4343fc53431695742a989.tar.gz |
Added all filters
Diffstat (limited to 'app/assets/javascripts/milestone_select.js')
-rw-r--r-- | app/assets/javascripts/milestone_select.js | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index f7e1f4a0816..a026f178720 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -5,12 +5,19 @@ (function() { this.MilestoneSelect = (function() { - function MilestoneSelect(currentProject) { + function MilestoneSelect(currentProject, els) { var _this; if (currentProject != null) { _this = this; this.currentProject = JSON.parse(currentProject); } + + $els = $(els); + + if (!els) { + $els = $('.js-label-select'); + } + $('.js-milestone-select').each(function(i, dropdown) { var $block, $dropdown, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, collapsedSidebarLabelTemplate, defaultLabel, issuableId, issueUpdateURL, milestoneLinkNoneTemplate, milestoneLinkTemplate, milestonesUrl, projectId, selectedMilestone, showAny, showNo, showUpcoming, useId, showMenuAbove; $dropdown = $(dropdown); @@ -108,7 +115,7 @@ }, vue: $dropdown.hasClass('js-issue-board-sidebar'), clicked: function(selected, $el, e) { - var data, isIssueIndex, isMRIndex, page; + var data, isIssueIndex, isMRIndex, page, boardsStore; page = $('body').data('page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = (page === page && page === 'projects:merge_requests:index'); @@ -116,11 +123,19 @@ e.preventDefault(); return; } - if ($el.closest('.add-issues-modal').length) { - gl.issueBoards.ModalStore.store.filter[$dropdown.data('field-name')] = selected.name; - } else if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar')) { - gl.issueBoards.BoardsStore.state.filters[$dropdown.data('field-name')] = selected.name; - gl.issueBoards.BoardsStore.updateFiltersUrl(); + + if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar') && + !$dropdown.closest('.add-issues-modal').length) { + boardsStore = gl.issueBoards.BoardsStore.state.filters; + } else if ($dropdown.closest('.add-issues-modal').length) { + boardsStore = gl.issueBoards.ModalStore.store.filter; + } + + if (boardsStore) { + boardsStore[$dropdown.data('field-name')] = selected.name; + if (!$dropdown.closest('.add-issues-modal').length) { + gl.issueBoards.BoardsStore.updateFiltersUrl(); + } e.preventDefault(); } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { if (selected.name != null) { |