diff options
| author | Unknwon <u@gogs.io> | 2015-09-02 05:09:12 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-09-02 05:09:12 -0400 |
| commit | 1abfe4e05f2c936ab43c8188003a33213b245a56 (patch) | |
| tree | 38cec881f7ce3e1a60d47ced5d68be6563dd853f /templates | |
| parent | 37e0cee8770fc4f14857e16eabe83ab7e93a0646 (diff) | |
| download | gitea-1abfe4e05f2c936ab43c8188003a33213b245a56.tar.gz gitea-1abfe4e05f2c936ab43c8188003a33213b245a56.zip | |
PR: nothing to commit and has pull request check
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/pulls/compare.tmpl | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 25811522b4..68838a12f5 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -133,7 +133,7 @@ {{if .Issue.IsPull}} <div class="comment merge box"> - <a class="avatar text {{if .Issue.IsClosed}}grey{{else if .Issue.PullRepo.CanAutoMerge}}green{{else}}red{{end}}"> + <a class="avatar text {{if .Issue.IsClosed}}grey{{else if .Issue.CanAutoMerge}}green{{else}}red{{end}}"> <span class="mega-octicon octicon-git-merge"></span> </a> <div class="content"> @@ -142,17 +142,19 @@ <div class="item text grey"> {{$.i18n.Tr "repo.pulls.reopen_to_merge"}} </div> - {{else if .Issue.PullRepo.CanAutoMerge}} + {{else if .Issue.CanAutoMerge}} <div class="item text green"> <span class="octicon octicon-check"></span> {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} </div> + {{if .IsRepositoryAdmin}} <div class="ui divider"></div> <div> <button class="ui green button"> <span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}} </button> </div> + {{end}} {{else}} <div class="item text red"> <span class="octicon octicon-x"></span> diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl index 79f15730c8..d176ac36ab 100644 --- a/templates/repo/pulls/compare.tmpl +++ b/templates/repo/pulls/compare.tmpl @@ -45,10 +45,20 @@ </div> </div> </div> - {{template "repo/issue/new_form" .}} + {{if .IsNothingToCompare}} + <div class="ui segment"> + {{.i18n.Tr "repo.pulls.nothing_to_compare"}} + </div> + {{else if .HasPullRequest}} + <div class="ui segment"> + {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.PullIndex | Safe}} + </div> + {{else}} + {{template "repo/issue/new_form" .}} {{template "repo/commits_table" .}} {{template "repo/diff_box" .}} + {{end}} </div> </div> |