Download as
Browse Code »

Commit 2eb76186f503410df5018765bc32337a8754159a

Authored by Dmitriy Zaporozhets
2 parents 3db47d12 5fba1d95
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #5158 from tkoenig/fix-active-milestone-order 

Sort active milestones by due date (upcoming first)
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/projects/milestones_controller.rb
  Diff comments   View file @2eb7618
@@ -14,7 +14,7 @@ class Projects::MilestonesController < Projects::ApplicationController @@ -14,7 +14,7 @@ class Projects::MilestonesController < Projects::ApplicationController
14 @milestones = case params[:f] 14 @milestones = case params[:f]
15 when 'all'; @project.milestones.order("state, due_date DESC") 15 when 'all'; @project.milestones.order("state, due_date DESC")
16 when 'closed'; @project.milestones.closed.order("due_date DESC") 16 when 'closed'; @project.milestones.closed.order("due_date DESC")
17 - else @project.milestones.active.order("due_date DESC") 17 + else @project.milestones.active.order("due_date ASC")
18 end 18 end
19 19
20 @milestones = @milestones.includes(:project) 20 @milestones = @milestones.includes(:project)