diff options
| author | Mario Lubenka <mario.lubenka@googlemail.com> | 2019-06-27 16:15:30 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-06-27 22:15:30 +0800 |
| commit | 7c0f2b9843f67ec49ea0038692648a531138a055 (patch) | |
| tree | 9041ca592b8fef9937e6cd3abb5dc57683f12473 /templates | |
| parent | c37ec66ee25b95525b9c8dfddd5a6f9a798150fe (diff) | |
| download | gitea-7c0f2b9843f67ec49ea0038692648a531138a055.tar.gz gitea-7c0f2b9843f67ec49ea0038692648a531138a055.zip | |
Show Pull Request button or status of latest PR in branch list (#6990)
* Show Pull Request button or status of latest PR in branch list
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Do not show pull request button on deleted branches
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Do not show commit divergence on deleted branches
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Use XORMs Get instead of limit
* Links pull request ID and use smaller labels for displaying the pull request status
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Handle error when getting latest pull request
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Indent template
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Check error when loading issue
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/branch/list.tmpl | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 58e77f2c11..a2fb5c2069 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -26,7 +26,8 @@ <table class="ui very basic striped fixed table single line"> <thead> <tr> - <th class="seven wide">{{.i18n.Tr "repo.branch.name"}}</th> + <th class="six wide">{{.i18n.Tr "repo.branch.name"}}</th> + <th class="two wide"></th> <th class="two wide"></th> {{if and $.IsWriter (not $.IsMirror)}} <th class="one wide right aligned">{{.i18n.Tr "repo.branch.delete_head"}}</th> @@ -44,9 +45,10 @@ {{else}} <a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a> <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> - </td> {{end}} + </td> <td class="ui"> + {{if not .IsDeleted}} <div class="commit-divergence"> <div class="bar-group"> <div class="count count-behind">{{.CommitsBehind}}</div> @@ -57,6 +59,25 @@ <div class="bar bar-ahead" style="width: {{percentage .CommitsAhead .CommitsBehind .CommitsAhead}}%"></div> </div> </div> + {{end}} + </td> + <td class="right aligned"> + {{if not .LatestPullRequest}} + {{if not .IsDeleted}} + <a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}"> + <button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button> + </a> + {{end}} + {{else}} + <a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}">#{{.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> + {{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> + {{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> + {{end}} + {{end}} </td> {{if and $.IsWriter (not $.IsMirror)}} <td class="right aligned"> |