diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-02-01 21:54:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-01 15:54:25 +0200 |
commit | 3ccd271081f45a6950a058e800cd9efbfae36cad (patch) | |
tree | a09a80b397b2545b30b5774ecb774105424bf07d /templates/repo/branch/list.tmpl | |
parent | 107a694fd6cced86bec8ab61cff3c472cbee08f1 (diff) | |
download | gitea-3ccd271081f45a6950a058e800cd9efbfae36cad.tar.gz gitea-3ccd271081f45a6950a058e800cd9efbfae36cad.zip |
Fix branch page pull request title and link error (#10092)
* Fix branch page pull request title and link error
* Fix ui
Diffstat (limited to 'templates/repo/branch/list.tmpl')
-rw-r--r-- | templates/repo/branch/list.tmpl | 10 |
1 files changed, 5 insertions, 5 deletions
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> |