Browse Source

Merge pull request '里程碑按创建时间倒序排,给前端区分开启和关闭的里程碑' (#1152) from fix-1052 into V20211228

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1152
Reviewed-by: lewis <747342561@qq.com>
dataset_independetn
lewis 3 years ago
parent
commit
1aeb3b1e26
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      models/issue_milestone.go
  2. +2
    -1
      routers/repo/issue.go

+ 1
- 1
models/issue_milestone.go View File

@@ -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.


+ 2
- 1
routers/repo/issue.go View File

@@ -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


Loading…
Cancel
Save