From fddda21ea2b2a53b661503a0a0bd4493c1564f24 Mon Sep 17 00:00:00 2001
From: RedCocoon <zzsmd0000@gmail.com>
Date: Thu, 31 Oct 2024 00:08:47 +0800
Subject: [PATCH] Fix comment form orphan tag issue with lint

---
 templates/repo/conversation/comment_form.tmpl | 29 +++----------------
 .../conversation/comment_form_content.tmpl    | 24 +++++++++++++++
 2 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 templates/repo/conversation/comment_form_content.tmpl

diff --git a/templates/repo/conversation/comment_form.tmpl b/templates/repo/conversation/comment_form.tmpl
index cc5e42a124b..0e8e3efb91b 100644
--- a/templates/repo/conversation/comment_form.tmpl
+++ b/templates/repo/conversation/comment_form.tmpl
@@ -11,34 +11,13 @@
             <div class="ui segment">
                 {{if .IsIssue}}
                     <form class="ui form form-fetch-action" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post">
+                        {{template "repo/conversation/comment_form_content" .}}
+                    </form>
                 {{else}}
                     <form class="ui form form-fetch-action" id="comment-form" action="{{$.RepoLink}}/conversations/{{.Conversation.Index}}/comments" method="post">
+                        {{template "repo/conversation/comment_form_content" .}}
+                    </form>
                 {{end}}
-                    {{template "repo/conversation/comment_tab" .}}
-                    {{.CsrfTokenHtml}}
-                    <div class="field footer">
-                        <div class="text right">
-                            {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}}
-                                {{if and .IsIssue .Issue.IsClosed}}
-                                    <button id="status-button" class="ui primary basic button" data-status="{{ctx.Locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{ctx.Locale.Tr "repo.issues.reopen_comment_issue"}}" name="status" value="reopen">
-                                        {{ctx.Locale.Tr "repo.issues.reopen_issue"}}
-                                    </button>
-                                {{else}}
-                                    {{$closeTranslationKey := "repo.issues.close"}}
-                                    {{if and .IsIssue .Issue.IsPull}}
-                                        {{$closeTranslationKey = "repo.pulls.close"}}
-                                    {{end}}
-                                    <button id="status-button" class="ui red basic button" data-status="{{ctx.Locale.Tr $closeTranslationKey}}" data-status-and-comment="{{ctx.Locale.Tr "repo.issues.close_comment_issue"}}" name="status" value="close">
-                                        {{ctx.Locale.Tr $closeTranslationKey}}
-                                    </button>
-                                {{end}}
-                            {{end}}
-                            <button id="comment-button" class="ui primary button">
-                                {{ctx.Locale.Tr "repo.issues.create_comment"}}
-                            </button>
-                        </div>
-                    </div>
-                </form>
             </div>
         </div>
     </div>
diff --git a/templates/repo/conversation/comment_form_content.tmpl b/templates/repo/conversation/comment_form_content.tmpl
new file mode 100644
index 00000000000..186a2d6a966
--- /dev/null
+++ b/templates/repo/conversation/comment_form_content.tmpl
@@ -0,0 +1,24 @@
+{{template "repo/conversation/comment_tab" .}}
+{{.CsrfTokenHtml}}
+<div class="field footer">
+    <div class="text right">
+        {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}}
+            {{if and .IsIssue .Issue.IsClosed}}
+                <button id="status-button" class="ui primary basic button" data-status="{{ctx.Locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{ctx.Locale.Tr "repo.issues.reopen_comment_issue"}}" name="status" value="reopen">
+                    {{ctx.Locale.Tr "repo.issues.reopen_issue"}}
+                </button>
+            {{else}}
+                {{$closeTranslationKey := "repo.issues.close"}}
+                {{if and .IsIssue .Issue.IsPull}}
+                    {{$closeTranslationKey = "repo.pulls.close"}}
+                {{end}}
+                <button id="status-button" class="ui red basic button" data-status="{{ctx.Locale.Tr $closeTranslationKey}}" data-status-and-comment="{{ctx.Locale.Tr "repo.issues.close_comment_issue"}}" name="status" value="close">
+                    {{ctx.Locale.Tr $closeTranslationKey}}
+                </button>
+            {{end}}
+        {{end}}
+        <button id="comment-button" class="ui primary button">
+            {{ctx.Locale.Tr "repo.issues.create_comment"}}
+        </button>
+    </div>
+</div>
\ No newline at end of file