From 3ccd271081f45a6950a058e800cd9efbfae36cad Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 1 Feb 2020 21:54:25 +0800
Subject: [PATCH] Fix branch page pull request title and link error (#10092)
* Fix branch page pull request title and link error
* Fix ui
---
routers/repo/branch.go | 2 +-
templates/repo/branch/list.tmpl | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/routers/repo/branch.go b/routers/repo/branch.go
index 88bbe2be56..ea4f68948d 100644
--- a/routers/repo/branch.go
+++ b/routers/repo/branch.go
@@ -239,6 +239,7 @@ func loadBranches(ctx *context.Context) []*Branch {
} else {
repoIDToRepo[pr.BaseRepoID] = pr.BaseRepo
}
+ pr.Issue.Repo = pr.BaseRepo
if pr.HasMerged {
baseGitRepo, ok := repoIDToGitRepo[pr.BaseRepoID]
@@ -261,7 +262,6 @@ func loadBranches(ctx *context.Context) []*Branch {
mergeMovedOn = true
}
}
-
}
isIncluded := divergence.Ahead == 0 && ctx.Repo.Repository.DefaultBranch != branchName
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 073516f25f..a24360795e 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -73,7 +73,7 @@
</div>
{{end}}
</td>
- <td class="two wide right aligned">
+ <td class="three wide right aligned">
{{if not .LatestPullRequest}}
{{if .IsIncluded}}
<a class="ui poping up orange small label" data-content="{{$.i18n.Tr "repo.branch.included_desc"}}" data-variation="tiny inverted" data-position="top right">
@@ -91,13 +91,13 @@
</a>
{{end}}
{{else}}
- <a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}">#{{.LatestPullRequest.Issue.Index}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}">{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}}</a>
{{if .LatestPullRequest.HasMerged}}
- <a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}" class="ui purple small label"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.merged"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui purple mini label"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.merged"}}</a>
{{else if .LatestPullRequest.Issue.IsClosed}}
- <a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}" class="ui red small label"><i class="octicon octicon-issue-closed"></i> {{$.i18n.Tr "repo.issues.closed_title"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui red mini label"><i class="octicon octicon-issue-closed"></i> {{$.i18n.Tr "repo.issues.closed_title"}}</a>
{{else}}
- <a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}" class="ui green small label"><i class="octicon octicon-issue-opened"></i> {{$.i18n.Tr "repo.issues.open_title"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui green mini label"><i class="octicon octicon-issue-opened"></i> {{$.i18n.Tr "repo.issues.open_title"}}</a>
{{end}}
{{end}}
</td>