diff options
author | Oliver Rogers <oliver.rogers@bluefinsolutions.com> | 2016-01-23 22:31:46 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-10 17:42:20 +0100 |
commit | a7567ca15203f63b59a736d5d391054ebc20d73d (patch) | |
tree | 47bddf2c46cca7b9d3a2a3c403321f89d22c28aa /app/helpers/issues_helper.rb | |
parent | fd1a68d4da4cba2f8e2894e2e1adfbe26216f491 (diff) | |
download | gitlab-ce-a7567ca15203f63b59a736d5d391054ebc20d73d.tar.gz |
Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-order
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r-- | app/helpers/issues_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 43262d579e9..ae4ebc0854a 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -44,14 +44,14 @@ module IssuesHelper end def bulk_update_milestone_options - milestones = project_active_milestones.to_a + milestones = @project.milestones.active.reorder(due_date: :asc, title: :asc).to_a milestones.unshift(Milestone::None) options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id]) end def milestone_options(object) - milestones = object.project.milestones.active.to_a + milestones = object.project.milestones.active.reorder(due_date: :asc, title: :asc).to_a milestones.unshift(Milestone::None) options_from_collection_for_select(milestones, 'id', 'title', object.milestone_id) @@ -69,7 +69,7 @@ module IssuesHelper end end - def issue_button_visibility(issue, closed) + def issue_button_visibility(issue, closed) return 'hidden' if issue.closed? == closed end |