From 0cb7a18e975841a3cd21a3f4671103109c87e9fa Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Thu, 16 Dec 2021 17:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E6=8C=89=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=EF=BC=8C?= =?UTF-8?q?=E7=BB=99=E5=89=8D=E7=AB=AF=E5=8C=BA=E5=88=86=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=92=8C=E5=85=B3=E9=97=AD=E7=9A=84=E9=87=8C=E7=A8=8B=E7=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/issue_milestone.go | 2 +- routers/repo/issue.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 -- 2.34.1