serv/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-30 15:43:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Show correct commit status in PR list (#8316)

Browse source 
* 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 return nil, err
} }
repo := pr.HeadRepo
lastCommitID, err := headGitRepo.GetBranchCommitID(pr.HeadBranch) lastCommitID, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var statusList []*CommitStatus err = pr.LoadBaseRepo()
statusList, err = GetLatestCommitStatus(repo, lastCommitID, 0) if err != nil {
return nil, err
}
statusList, err := GetLatestCommitStatus(pr.BaseRepo, lastCommitID, 0)
if err != nil { if err != nil {
return nil, err 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> <a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a>
{{if .IsPull }} {{if .IsPull }}
{{if (index $.CommitStatus .ID)}} {{if (index $.CommitStatus .PullRequest.ID)}}
{{template "repo/commit_status" (index $.CommitStatus .ID)}} {{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}}
{{end}} {{end}}
{{end}} {{end}}