Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (g…

…o-gitea#23790) Fix regression of go-gitea#22683 , it didn't pass all variables into sub-template. Close go-gitea#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) # Conflicts: # templates/repo/issue/view_content/update_branch_by_merge.tmpl
wxiaoguang · Mar 30, 2023 · 0e2c1ad · 0e2c1ad
1 parent d15f20b
commit 0e2c1ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git 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
@@ -1,16 +1,15 @@
-{{$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">
 			<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}}
+			{{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">
-								<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>
+								<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>