Fix #21740.
Updated the Pull Request template so that the 'Update branch by merge'
button is visible for WIP PR's. Making the behaviour match a non WIP-PR.
Previous WIP page with changes pending on the branch:
Updated UI adding the update button:
## Notes
* have not removed the **$canAutoMerge** variable from the pull.tmpl on
this
[line](36dc11869d/templates/repo/issue/view_content/pull.tmpl (L131))
- doesn't appear to be used elsewhere but wasn't sure
* In order to avoid duplicating code corresponding UI code was added to
a new tmpl file, ```update_branch_by_merge.tmpl``` and is called in two
places from ```pull.tmpl```.
---------
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
jladbrook
GitHub
parent
82728a7cec
commit
891391689a
2 changed files with 41 additions and 38 deletions
|
|
@ -190,6 +190,7 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}}
|
||||||
{{else if .Issue.PullRequest.IsChecking}}
|
{{else if .Issue.PullRequest.IsChecking}}
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<i class="icon icon-octicon">{{svg "octicon-sync"}}</i>
|
<i class="icon icon-octicon">{{svg "octicon-sync"}}</i>
|
||||||
|
|
@ -282,44 +283,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}}
|
{{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}}
|
||||||
<div class="ui divider"></div>
|
|
||||||
<div class="item item-section">
|
|
||||||
<div class="item-section-left">
|
|
||||||
<i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
|
|
||||||
{{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
|
|
||||||
</div>
|
|
||||||
<div class="item-section-right">
|
|
||||||
{{if and .UpdateAllowed .UpdateByRebaseAllowed}}
|
|
||||||
<div class="dib">
|
|
||||||
<div class="ui buttons update-button">
|
|
||||||
<button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}">
|
|
||||||
<span class="button-text">
|
|
||||||
{{$.locale.Tr "repo.pulls.update_branch"}}
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div class="ui dropdown icon button no-text">
|
|
||||||
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
|
||||||
<div class="menu">
|
|
||||||
<div class="item active selected" data-do="{{.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</div>
|
|
||||||
<div class="item" data-do="{{.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}}
|
|
||||||
<form action="{{.Link}}/update" method="post" class="ui update-branch-form">
|
|
||||||
{{.CsrfTokenHtml}}
|
|
||||||
<button class="ui compact button" data-do="update">
|
|
||||||
<span class="ui text">{{$.locale.Tr "repo.pulls.update_branch"}}</span>
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{if .Issue.PullRequest.IsEmpty}}
|
{{if .Issue.PullRequest.IsEmpty}}
|
||||||
<div class="ui divider"></div>
|
<div class="ui divider"></div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
{{$canAutoMerge := false}}
|
||||||
|
{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}}
|
||||||
|
<div class="ui divider"></div>
|
||||||
|
<div class="item item-section">
|
||||||
|
<div class="item-section-left">
|
||||||
|
<i class="icon icon-octicon">{{svg "octicon-alert"}}</i>
|
||||||
|
{{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
|
||||||
|
</div>
|
||||||
|
<div class="item-section-right">
|
||||||
|
{{if and .UpdateAllowed .UpdateByRebaseAllowed}}
|
||||||
|
<div class="dib">
|
||||||
|
<div class="ui buttons update-button">
|
||||||
|
<button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}">
|
||||||
|
<span class="button-text">
|
||||||
|
{{$.locale.Tr "repo.pulls.update_branch"}}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div class="ui dropdown icon button no-text">
|
||||||
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
||||||
|
<div class="menu">
|
||||||
|
<div class="item active selected" data-do="{{.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</div>
|
||||||
|
<div class="item" data-do="{{.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
{{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}}
|
||||||
|
<form action="{{.Link}}/update" method="post" class="ui update-branch-form">
|
||||||
|
{{.CsrfTokenHtml}}
|
||||||
|
<button class="ui compact button" data-do="update">
|
||||||
|
<span class="ui text">{{$.locale.Tr "repo.pulls.update_branch"}}</span>
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
Loading…
Reference in a new issue