diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-03-31 01:00:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-30 13:00:49 -0400 |
| commit | ffd22697baa8c1e28c6acb8a424359b9c5c5a58e (patch) | |
| tree | 233a3da18463533903a6d6a3318110b22e01d2ab | |
| parent | c09eab54859f34247b9cf9278fa322f9ecfc6afa (diff) | |
| download | gitea-ffd22697baa8c1e28c6acb8a424359b9c5c5a58e.tar.gz gitea-ffd22697baa8c1e28c6acb8a424359b9c5c5a58e.zip | |
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.
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 5 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/update_branch_by_merge.tmpl | 19 |
2 files changed, 11 insertions, 13 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 4d5d6ee493..8b758b2ac0 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -128,7 +128,6 @@ {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a> <div class="content"> {{template "repo/pulls/status" .}} - {{$canAutoMerge := false}} {{$showGeneralMergeForm := false}} <div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}"> {{if .Issue.PullRequest.HasMerged}} @@ -193,7 +192,7 @@ {{end}} </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}} <div class="item"> <i class="icon icon-octicon">{{svg "octicon-sync"}}</i> @@ -286,7 +285,7 @@ </div> {{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}} <div class="ui divider"></div> diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 49e4467dc3..84df244d8d 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -1,5 +1,4 @@ -{{$canAutoMerge := false}} -{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} +{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}} <div class="ui divider"></div> <div class="item item-section"> <div class="item-section-left"> @@ -7,10 +6,10 @@ {{$.locale.Tr "repo.pulls.outdated_with_base_branch"}} </div> <div class="item-section-right"> - {{if and .UpdateAllowed .UpdateByRebaseAllowed}} + {{if and $.UpdateAllowed $.UpdateByRebaseAllowed}} <div class="gt-dib"> <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"> {{$.locale.Tr "repo.pulls.update_branch"}} </span> @@ -19,17 +18,17 @@ <div class="ui dropdown icon button no-text"> {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> - <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 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> </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"> + {{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}} + <form action="{{$.Link}}/update" method="post" class="ui update-branch-form"> + {{$.CsrfTokenHtml}} + <button class="ui compact button"> <span class="ui text">{{$.locale.Tr "repo.pulls.update_branch"}}</span> </button> </form> |