Ver código fonte
Fix branch page pull request title and link error (#10092) (#10097)
* Fix branch page pull request title and link error (#10092)tags/v1.11.0
Lunny Xiao
4 anos atrás
2 arquivos alterados com 6 adições e 6 exclusões
+ 1
- 1
routers/repo/branch.go
Ver arquivo
| @@ -238,6 +238,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] | |||
| @@ -260,7 +261,6 @@ func loadBranches(ctx *context.Context) []*Branch { | |||
| mergeMovedOn = true | |||
| } | |||
| } | |||
| } | |||
| isIncluded := divergence.Ahead == 0 && ctx.Repo.Repository.DefaultBranch != branchName | |||
+ 5
- 5
templates/repo/branch/list.tmpl
Ver arquivo
| @@ -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 ne .LatestPullRequest.BaseRepoID .LatestPullRequest.HeadRepoID}}{{.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> | |||
Carregando…