finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show last commit status in pull request lists (#6465)

Browse source
This commit is contained in:
Elias Norberg 2019-04-02 21:54:29 +02:00 • committed by techknowlogick
parent 09fb036ad6
commit bf5af87eef
6 changed files with 144 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
routers/repo/issue.go
View file

@ -214,6 +214,8 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB
}
}
var commitStatus = make(map[int64]*models.CommitStatus, len(issues))
// Get posters.
for i := range issues {
// Check read status
@ -223,8 +225,14 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB
ctx.ServerError("GetIsRead", err)
return
}
if isPullOption == util.OptionalBoolTrue {
commitStatus[issues[i].PullRequest.ID], _ = issues[i].PullRequest.GetLastCommitStatus()
}
}
ctx.Data["Issues"] = issues
ctx.Data["CommitStatus"] = commitStatus
// Get assignees.
ctx.Data["Assignees"], err = repo.GetAssignees()

6
routers/user/home.go
View file

@ -319,8 +319,13 @@ func Issues(ctx *context.Context) {
return
}
var commitStatus = make(map[int64]*models.CommitStatus, len(issues))
for _, issue := range issues {
issue.Repo = showReposMap[issue.RepoID]
if isPullList {
commitStatus[issue.PullRequest.ID], _ = issue.PullRequest.GetLastCommitStatus()
}
}
issueStats, err := models.GetUserIssueStats(models.UserIssueStatsOptions{
@ -344,6 +349,7 @@ func Issues(ctx *context.Context) {
}
ctx.Data["Issues"] = issues
ctx.Data["CommitStatus"] = commitStatus
ctx.Data["Repos"] = showRepos
ctx.Data["Counts"] = counts
ctx.Data["Page"] = paginater.New(total, setting.UI.IssuePagingNum, page, 5)