From 7b3ffe5745152513468adbeaae1102a27c30b67b Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Tue, 21 Feb 2023 18:04:29 +0800
Subject: [PATCH] Fix the Manually Merged form (#23015) (#23017)
Backport #23015
---------
Co-authored-by: Jason Song <i@wolfogre.com>
---
templates/repo/issue/view_content/pull.tmpl | 20 +++++++------------
.../js/components/PullRequestMergeForm.vue | 4 ++++
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 1e07225300..d765daf322 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -129,6 +129,7 @@
<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}}
<div class="item text">
@@ -351,6 +352,7 @@
'textAutoMergeButtonWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
'textAutoMergeWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_when_succeed"}},
'textAutoMergeCancelSchedule': {{$.locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
+ 'textMergeCommitId': {{$.locale.Tr "repo.pulls.merge_commit_id"}},
'canMergeNow': {{$canMergeNow}},
'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
@@ -410,6 +412,7 @@
})();
</script>
+ {{$showGeneralMergeForm = true}}
<div id="pull-request-merge-form"></div>
{{if .ShowMergeInstructions}}
@@ -487,30 +490,21 @@
{{$.locale.Tr "repo.pulls.cannot_auto_merge_helper"}}
</div>
{{end}}
- {{end}}
+ {{end}}{{/* end if: pull request status */}}
- {{if $.StillCanManualMerge}}
+ {{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
<div class="ui divider"></div>
- <div class="ui form manually-merged-fields" style="display: none">
+ <div class="ui form">
<form action="{{.Link}}/merge" method="post">
{{.CsrfTokenHtml}}
<div class="field">
- <input type="text" name="merge_commit_id" placeholder="{{$.locale.Tr "repo.pulls.merge_commit_id"}}">
+ <input type="text" name="merge_commit_id" placeholder="{{$.locale.Tr "repo.pulls.merge_commit_id"}}">
</div>
<button class="ui red button" type="submit" name="do" value="manually-merged">
{{$.locale.Tr "repo.pulls.merge_manually"}}
</button>
- <button class="ui button merge-cancel">
- {{$.locale.Tr "cancel"}}
- </button>
</form>
</div>
-
- <div class="ui red buttons merge-button">
- <button class="ui button" data-do="manually-merged">
- {{$.locale.Tr "repo.pulls.merge_manually"}}
- </button>
- </div>
{{end}}
</div>
</div>
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index bfe05628e8..61c95477e7 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -28,6 +28,10 @@
</div>
</template>
+ <div class="field" v-if="mergeStyle === 'manually-merged'">
+ <input type="text" name="merge_commit_id" :placeholder="mergeForm.textMergeCommitId">
+ </div>
+
<button class="ui button" :class="mergeButtonStyleClass" type="submit" name="do" :value="mergeStyle">
{{ mergeStyleDetail.textDoMerge }}
<template v-if="autoMergeWhenSucceed">