diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-23 16:44:09 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-29 11:57:04 +0100 |
| commit | 7ff6af19cc2d0f300a184de3887e4e5163bc9a00 (patch) | |
| tree | 0a27ae9bf8b185ae657c7624aec31ad94f23453f /app/assets/javascripts/milestone_select.js.coffee | |
| parent | f4238634d3a2661ef5998d3c0df6a6fb90174013 (diff) | |
| download | gitlab-ce-7ff6af19cc2d0f300a184de3887e4e5163bc9a00.tar.gz | |
Dropdown bug fixes
Added back upcoming to milestone filter
Fixed bug that would cause the currently selected value to disappear on filters
Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
Diffstat (limited to 'app/assets/javascripts/milestone_select.js.coffee')
| -rw-r--r-- | app/assets/javascripts/milestone_select.js.coffee | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee index d1746c38e74..5f5f38e0d47 100644 --- a/app/assets/javascripts/milestone_select.js.coffee +++ b/app/assets/javascripts/milestone_select.js.coffee @@ -27,6 +27,18 @@ class @MilestoneSelect milestoneLinkNoneTemplate = '<div class="light">None</div>' + extraOptions = [{ + isAny: true + title: 'Any Milestone' + }, { + id: '0' + title: 'No Milestone' + }, { + upcoming: true + id: '#upcoming' + title: 'Upcoming' + }] + $dropdown.glDropdown( data: (term, callback) -> $.ajax( @@ -73,11 +85,13 @@ class @MilestoneSelect hidden: -> $selectbox.hide() $value.show() - clicked: (e) -> + clicked: (selected) -> if $dropdown.hasClass 'js-filter-bulk-update' return - + if $dropdown.hasClass 'js-filter-submit' + if selected.title? + selectedMilestone = selected.title $dropdown.parents('form').submit() else selected = $selectbox @@ -104,4 +118,4 @@ class @MilestoneSelect $value.html(milestoneLinkTemplate(data.milestone)) else $value.html(milestoneLinkNoneTemplate) - )
\ No newline at end of file + ) |