diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-29 14:17:22 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-29 14:17:22 +0300 |
| commit | 35b3c7096dc8d49000b896fd8ff1eb999e8cc321 (patch) | |
| tree | 893c2fb97cd2ae8123b2328c603d2d6b639ac8ec /app/assets/javascripts/milestone_select.js.coffee | |
| parent | f8b5ff95202dec5011d92427d9acbe858b59b57d (diff) | |
Fixed multiselect
Diffstat (limited to 'app/assets/javascripts/milestone_select.js.coffee')
| -rw-r--r-- | app/assets/javascripts/milestone_select.js.coffee | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee index f98a7dda3dd..d61d03791fa 100644 --- a/app/assets/javascripts/milestone_select.js.coffee +++ b/app/assets/javascripts/milestone_select.js.coffee @@ -33,20 +33,6 @@ class @MilestoneSelect $.ajax( url: milestonesUrl ).done (data) -> -<<<<<<< c9dea7761dc69ff38d101d06e0e636e1f3b2a0c4 - if $dropdown.hasClass "js-extra-options" - if showNo - data.unshift( - id: '0' - title: 'No Milestone' - ) - - if showAny - data.unshift( - isAny: true - title: 'Any Milestone' - ) -======= extraOptions = [] if showAny extraOptions.push( @@ -68,11 +54,11 @@ class @MilestoneSelect name: '#upcoming' title: 'Upcoming' ) ->>>>>>> Updated to only include upcoming on filters - if data.length > 2 - data.splice 2, 0, 'divider' - callback(data) + if extraOptions.length > 2 + extraOptions.push 'divider' + + callback(extraOptions.concat(data)) filterable: true search: fields: ['title'] @@ -99,7 +85,7 @@ class @MilestoneSelect if $dropdown.hasClass 'js-filter-bulk-update' return - if $dropdown.hasClass('js-filter-submit') and (isIssueIndex or isMRIndex) + if $dropdown.hasClass('js-filter-submit') if selected.name? selectedMilestone = selected.name else if selected.title? |