diff --git a/models/issue_milestone.go b/models/issue_milestone.go index 4648274459..a08bbf4dcc 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -353,7 +353,7 @@ func GetMilestonesByRepoID(repoID int64, state api.StateType, listOptions ListOp } miles := make([]*Milestone, 0, listOptions.PageSize) - return miles, sess.Asc("deadline_unix").Asc("id").Find(&miles) + return miles, sess.Desc("id").Find(&miles) } // GetMilestones returns a list of milestones of given repository and status. diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 7aa8151dab..7ab5eb2835 100755 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -357,7 +357,8 @@ func Issues(ctx *context.Context) { var err error // Get milestones. - ctx.Data["Milestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID, api.StateAll, models.ListOptions{}) + ctx.Data["OpenMilestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID, api.StateOpen, models.ListOptions{}) + ctx.Data["ClosedMilestones"], err = models.GetMilestonesByRepoID(ctx.Repo.Repository.ID, api.StateClosed, models.ListOptions{}) if err != nil { ctx.ServerError("GetAllRepoMilestones", err) return