0c0155daf7
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/7167 - Replies to pending review comments no longer generate a notification, this was caused by an incomplete determination if the comment was part of the pending review or not. - The logic was reworked to do the following if it's part of a pending review: It is not a single review and if it's a reply then the comment it is replying to is part of a pending review. - Added integration test. - Resolves forgejo/forgejo#7151 Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7178 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
48 lines
2.4 KiB
Go HTML Template
48 lines
2.4 KiB
Go HTML Template
{{if and $.root.SignedUserID (not $.Repository.IsArchived)}}
|
|
<form class="ui form {{if $.hidden}}tw-hidden comment-form{{end}}" action="{{$.root.Issue.Link}}/files/reviews/comments" method="post">
|
|
{{$.root.CsrfTokenHtml}}
|
|
<input type="hidden" name="origin" value="{{if $.root.PageIsPullFiles}}diff{{else}}timeline{{end}}">
|
|
<input type="hidden" name="latest_commit_id" value="{{$.root.AfterCommitID}}">
|
|
<input type="hidden" name="side" value="{{if $.Side}}{{$.Side}}{{end}}">
|
|
<input type="hidden" name="line" value="{{if $.Line}}{{$.Line}}{{end}}">
|
|
<input type="hidden" name="path" value="{{if $.File}}{{$.File}}{{end}}">
|
|
<input type="hidden" name="diff_start_cid">
|
|
<input type="hidden" name="diff_end_cid">
|
|
<input type="hidden" name="diff_base_cid">
|
|
|
|
{{template "shared/combomarkdowneditor" (dict
|
|
"MarkdownPreviewUrl" (print $.root.Repository.Link "/markup")
|
|
"MarkdownPreviewContext" $.root.RepoLink
|
|
"TextareaName" "content"
|
|
"TextareaPlaceholder" (ctx.Locale.Tr "repo.diff.comment.placeholder")
|
|
"DropzoneParentContainer" "form"
|
|
"DisableAutosize" "true"
|
|
)}}
|
|
|
|
{{if $.root.IsAttachmentEnabled}}
|
|
<div class="field">
|
|
{{template "repo/upload" $.root}}
|
|
</div>
|
|
{{end}}
|
|
|
|
<div class="field footer tw-mx-2">
|
|
<span class="markup-info">{{svg "octicon-markdown"}} {{ctx.Locale.Tr "repo.diff.comment.markdown_info"}}</span>
|
|
<div class="tw-text-right">
|
|
{{if $.reply}}
|
|
<button class="ui submit primary tiny button btn-reply" type="submit">{{ctx.Locale.Tr "repo.diff.comment.reply"}}</button>
|
|
<input type="hidden" name="reply" value="{{$.reply}}">
|
|
{{else}}
|
|
{{if $.root.CurrentReview}}
|
|
<button name="pending_review" type="submit" class="ui submit primary tiny button btn-add-comment">{{ctx.Locale.Tr "repo.diff.comment.add_review_comment"}}</button>
|
|
{{else}}
|
|
<button name="pending_review" type="submit" class="ui submit primary tiny button btn-start-review">{{ctx.Locale.Tr "repo.diff.comment.start_review"}}</button>
|
|
<button name="single_review" value="true" type="submit" class="ui submit tiny basic button btn-add-single">{{ctx.Locale.Tr "repo.diff.comment.add_single_comment"}}</button>
|
|
{{end}}
|
|
{{end}}
|
|
{{if or (not $.HasComments) $.hidden}}
|
|
<button type="button" class="ui submit tiny basic button btn-cancel cancel-code-comment">{{ctx.Locale.Tr "cancel"}}</button>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</form>
|
|
{{end}}
|