mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 23:29:12 +01:00
ca0921a95a
fixes #22907
Tested:
- [x] issue content edit
- [x] issue content change tasklist
- [x] pull request content edit
- [x] pull request change tasklist
![issue-content-edit](https://github.com/go-gitea/gitea/assets/29250154/a0828889-fb96-4bc4-8600-da92e3205812)
(cherry picked from commit aa92b13164e84c26be91153b6022220ce0a27720)
Conflicts:
models/issues/comment.go
c7a389f2b2
[FEAT] allow setting the update date on issues and comments
options/locale/locale_en-US.ini
trivial context conflicts
routers/api/v1/repo/issue_comment.go
routers/api/v1/repo/issue_comment_attachment.go
services/issue/comments.go
services/issue/content.go
user blocking is implemented differently in Forgejo
routers/web/repo/issue.go
trivial difference from 6a0750177f Allow to save empty comment
user blocking is implemented differently in Forgejo
templates/repo/issue/view_content/conversation.tmpl
templates changed a lot in Forgejo but the change is
trivially ported
tests/integration/issue_test.go
other tests were added in the same region
web_src/js/features/repo-issue-edit.js
the code is still web_src/js/features/repo-legacy.js
trivially ported
137 lines
6.5 KiB
Go HTML Template
137 lines
6.5 KiB
Go HTML Template
{{$invalid := (index .comments 0).Invalidated}}
|
|
{{$resolved := (index .comments 0).IsResolved}}
|
|
{{$resolveDoer := (index .comments 0).ResolveDoer}}
|
|
{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
|
|
<div class="ui segments conversation-holder">
|
|
<div class="ui segment collapsible-comment-box tw-py-2 tw-flex tw-items-center tw-justify-between">
|
|
<div class="tw-flex tw-items-center">
|
|
<a href="{{(index .comments 0).CodeCommentLink ctx}}" class="file-comment tw-ml-2 gt-word-break">{{(index .comments 0).TreePath}}</a>
|
|
{{if $invalid}}
|
|
<span class="ui label basic small tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
|
|
{{ctx.Locale.Tr "repo.issues.review.outdated"}}
|
|
</span>
|
|
{{end}}
|
|
</div>
|
|
<div>
|
|
{{if or $invalid $resolved}}
|
|
<button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="{{if not $resolved}}tw-hidden {{end}}ui compact labeled button show-outdated tw-flex tw-items-center">
|
|
{{svg "octicon-unfold" 16 "tw-mr-2"}}
|
|
{{if $resolved}}
|
|
{{ctx.Locale.Tr "repo.issues.review.show_resolved"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "repo.issues.review.show_outdated"}}
|
|
{{end}}
|
|
</button>
|
|
<button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="{{if $resolved}}tw-hidden {{end}}ui compact labeled button hide-outdated tw-flex tw-items-center">
|
|
{{svg "octicon-fold" 16 "tw-mr-2"}}
|
|
{{if $resolved}}
|
|
{{ctx.Locale.Tr "repo.issues.review.hide_resolved"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "repo.issues.review.hide_outdated"}}
|
|
{{end}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{$diff := (CommentMustAsDiff ctx (index .comments 0))}}
|
|
{{if $diff}}
|
|
{{$file := (index $diff.Files 0)}}
|
|
<div id="code-preview-{{(index .comments 0).ID}}" class="ui table segment{{if $resolved}} tw-hidden{{end}}">
|
|
<div class="diff-file-box diff-box file-content {{TabSizeClass $.Editorconfig $file.Name}}">
|
|
<div class="file-body file-code code-view code-diff code-diff-unified unicode-escaped">
|
|
<table>
|
|
<tbody>
|
|
{{template "repo/diff/section_unified" dict "file" $file "root" $}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
<div id="code-comments-{{(index .comments 0).ID}}" class="comment-code-cloud ui segment{{if $resolved}} tw-hidden{{end}}">
|
|
<div class="ui comments tw-mb-0">
|
|
{{range .comments}}
|
|
{{$createdSubStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
|
|
<div class="comment code-comment tw-pb-4" id="{{.HashTag}}">
|
|
<div class="content">
|
|
<div class="header comment-header">
|
|
<div class="comment-header-left tw-flex tw-items-center">
|
|
{{if not .OriginalAuthor}}
|
|
<a class="avatar">
|
|
{{ctx.AvatarUtils.Avatar .Poster 20}}
|
|
</a>
|
|
{{end}}
|
|
<span class="text grey muted-links">
|
|
{{if .OriginalAuthor}}
|
|
<span class="text black">
|
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}}
|
|
{{.OriginalAuthor}}
|
|
</span>
|
|
{{if $.Repository.OriginalURL}}
|
|
<span class="migrate">({{ctx.Locale.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname}})</span>
|
|
{{end}}
|
|
{{else}}
|
|
{{template "shared/user/authorlink" .Poster}}
|
|
{{end}}
|
|
{{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdSubStr}}
|
|
</span>
|
|
</div>
|
|
<div class="comment-header-right actions tw-flex tw-items-center">
|
|
{{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}}
|
|
{{if not $.Repository.IsArchived}}
|
|
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}}
|
|
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<div class="text comment-content">
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission (and $.IsSigned (eq $.SignedUserID .PosterID))}}data-can-edit="true"{{end}}>
|
|
{{if .RenderedContent}}
|
|
{{.RenderedContent}}
|
|
{{else}}
|
|
<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
|
|
{{end}}
|
|
</div>
|
|
<div id="issuecomment-{{.ID}}-raw" class="raw-content tw-hidden">{{.Content}}</div>
|
|
<div class="edit-content-zone tw-hidden" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-content-version="{{.ContentVersion}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div>
|
|
{{if .Attachments}}
|
|
{{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}}
|
|
{{end}}
|
|
</div>
|
|
{{$reactions := .Reactions.GroupByType}}
|
|
{{if $reactions}}
|
|
{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="code-comment-buttons tw-flex tw-items-center tw-flex-wrap tw-mt-2 tw-mb-1 tw-mx-2">
|
|
<div class="tw-flex-1">
|
|
{{if $resolved}}
|
|
<div class="ui grey text">
|
|
{{svg "octicon-check" 16 "tw-mr-1"}}
|
|
<b>{{$resolveDoer.Name}}</b> {{ctx.Locale.Tr "repo.issues.review.resolved_by"}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="code-comment-buttons-buttons">
|
|
{{if and $.CanMarkConversation $isNotPending}}
|
|
<button class="ui tiny basic button resolve-conversation" data-origin="timeline" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index .comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation">
|
|
{{if $resolved}}
|
|
{{ctx.Locale.Tr "repo.issues.review.un_resolve_conversation"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "repo.issues.review.resolve_conversation"}}
|
|
{{end}}
|
|
</button>
|
|
{{end}}
|
|
{{if and $.SignedUserID (not $.Repository.IsArchived)}}
|
|
<button class="comment-form-reply ui primary tiny labeled icon button tw-ml-1 tw-mr-0">
|
|
{{svg "octicon-reply" 16 "reply icon tw-mr-1"}}{{ctx.Locale.Tr "repo.diff.comment.reply"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}}
|
|
</div>
|
|
</div>
|