mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Show correct commit status in PR list (#8316) 

* Use correct index when fetching commit status

Signed-off-by: Elias Norberg <elias@aisle.se>

* Compare against base repo to avoid mismatch when merging from fork

Signed-off-by: Elias Norberg <elias@aisle.se>
This commit is contained in:
Elias Norberg 2019-09-30 03:07:43 +02:00 committed by Lunny Xiao
parent 9c2a58456a
commit 49547ea158
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
models/pull.go
View File

@ -353,14 +353,17 @@ func (pr *PullRequest) GetLastCommitStatus() (status *CommitStatus, err error) {
return nil, err
}
repo := pr.HeadRepo
lastCommitID, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
if err != nil {
return nil, err
}
var statusList []*CommitStatus
statusList, err = GetLatestCommitStatus(repo, lastCommitID, 0)
err = pr.LoadBaseRepo()
if err != nil {
return nil, err
}
statusList, err := GetLatestCommitStatus(pr.BaseRepo, lastCommitID, 0)
if err != nil {
return nil, err
}

4
templates/repo/issue/list.tmpl
View File

@ -212,8 +212,8 @@
<a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a>
{{if .IsPull }}
{{if (index $.CommitStatus .ID)}}
{{template "repo/commit_status" (index $.CommitStatus .ID)}}
{{if (index $.CommitStatus .PullRequest.ID)}}
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}}
{{end}}
{{end}}