mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-10 04:02:07 +02:00
Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790)
Fix regression of #22683 , it didn't pass all variables into sub-template. Close #23787 After the fix, all links and the form are correct. ![image](https://user-images.githubusercontent.com/2114189/228511037-580b5f5d-43e7-494f-9b66-89f9f908e208.png) ![image](https://user-images.githubusercontent.com/2114189/228510958-f960284a-101d-4b0e-b887-80033127898d.png)
This commit is contained in:
parent
c09eab5485
commit
ffd22697ba
2 changed files with 11 additions and 13 deletions
|
@ -128,7 +128,6 @@
|
||||||
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
|
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
{{template "repo/pulls/status" .}}
|
{{template "repo/pulls/status" .}}
|
||||||
{{$canAutoMerge := false}}
|
|
||||||
{{$showGeneralMergeForm := false}}
|
{{$showGeneralMergeForm := false}}
|
||||||
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
|
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
|
||||||
{{if .Issue.PullRequest.HasMerged}}
|
{{if .Issue.PullRequest.HasMerged}}
|
||||||
|
@ -193,7 +192,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)}}
|
{{template "repo/issue/view_content/update_branch_by_merge" $}}
|
||||||
{{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>
|
||||||
|
@ -286,7 +285,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}}
|
{{template "repo/issue/view_content/update_branch_by_merge" $}}
|
||||||
{{if .Issue.PullRequest.IsEmpty}}
|
{{if .Issue.PullRequest.IsEmpty}}
|
||||||
<div class="ui divider"></div>
|
<div class="ui divider"></div>
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{{$canAutoMerge := false}}
|
{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}}
|
||||||
{{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="ui divider"></div>
|
||||||
<div class="item item-section">
|
<div class="item item-section">
|
||||||
<div class="item-section-left">
|
<div class="item-section-left">
|
||||||
|
@ -7,10 +6,10 @@
|
||||||
{{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
|
{{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
|
||||||
</div>
|
</div>
|
||||||
<div class="item-section-right">
|
<div class="item-section-right">
|
||||||
{{if and .UpdateAllowed .UpdateByRebaseAllowed}}
|
{{if and $.UpdateAllowed $.UpdateByRebaseAllowed}}
|
||||||
<div class="gt-dib">
|
<div class="gt-dib">
|
||||||
<div class="ui buttons update-button">
|
<div class="ui buttons update-button">
|
||||||
<button class="ui button" data-do="{{.Link}}/update" data-redirect="{{.Link}}">
|
<button class="ui button" data-do="{{$.Link}}/update" data-redirect="{{$.Link}}">
|
||||||
<span class="button-text">
|
<span class="button-text">
|
||||||
{{$.locale.Tr "repo.pulls.update_branch"}}
|
{{$.locale.Tr "repo.pulls.update_branch"}}
|
||||||
</span>
|
</span>
|
||||||
|
@ -19,17 +18,17 @@
|
||||||
<div class="ui dropdown icon button no-text">
|
<div class="ui dropdown icon button no-text">
|
||||||
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
||||||
<div class="menu">
|
<div class="menu">
|
||||||
<a class="item active selected" data-do="{{.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</a>
|
<a class="item active selected" data-do="{{$.Link}}/update">{{$.locale.Tr "repo.pulls.update_branch"}}</a>
|
||||||
<a class="item" data-do="{{.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</a>
|
<a class="item" data-do="{{$.Link}}/update?style=rebase">{{$.locale.Tr "repo.pulls.update_branch_rebase"}}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}}
|
{{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}}
|
||||||
<form action="{{.Link}}/update" method="post" class="ui update-branch-form">
|
<form action="{{$.Link}}/update" method="post" class="ui update-branch-form">
|
||||||
{{.CsrfTokenHtml}}
|
{{$.CsrfTokenHtml}}
|
||||||
<button class="ui compact button" data-do="update">
|
<button class="ui compact button">
|
||||||
<span class="ui text">{{$.locale.Tr "repo.pulls.update_branch"}}</span>
|
<span class="ui text">{{$.locale.Tr "repo.pulls.update_branch"}}</span>
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
Loading…
Reference in a new issue