From 49547ea158ff2b028013cdcc12d18efc0556aac0 Mon Sep 17 00:00:00 2001
From: Elias Norberg <elias@aisle.se>
Date: Mon, 30 Sep 2019 03:07:43 +0200
Subject: [PATCH] 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>
---
 models/pull.go                 | 9 ++++++---
 templates/repo/issue/list.tmpl | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/models/pull.go b/models/pull.go
index 60ccb144f5..b41fb004e1 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -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
 	}
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 4874d97da4..e64cef2724 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -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}}