mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-24 08:57:03 -05:00
30a783879f
Backport #24936 If enabled show a clickable label in the comment. A click on the label opens the Conversation tab with the comment focussed - there you're able to view the old diff (or original diff the comment was created on). **Screenshots** ![image](https://github.com/go-gitea/gitea/assets/1135157/63ab9571-a9ee-4900-9f02-94ab0095f9e7) ![image](https://github.com/go-gitea/gitea/assets/1135157/78f7c225-8d76-46f5-acfd-9b8aab988a6c) When resolved and outdated: ![image](https://github.com/go-gitea/gitea/assets/1135157/6ece9ebd-c792-4aa5-9c35-628694e9d093) Option to enable/disable this (stored in user settings - default is disabled): ![image](https://github.com/go-gitea/gitea/assets/1135157/ed99dfe4-76dc-4c12-bd96-e7e62da50ab5) ![image](https://github.com/go-gitea/gitea/assets/1135157/e837a052-e92e-4a28-906d-9db5bacf93a6) fixes #24913 Co-authored-by: silverwind <me@silverwind.io>
66 lines
3.5 KiB
Handlebars
66 lines
3.5 KiB
Handlebars
{{$resolved := (index .comments 0).IsResolved}}
|
|
{{$invalid := (index .comments 0).Invalidated}}
|
|
{{$resolveDoer := (index .comments 0).ResolveDoer}}
|
|
{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
|
|
{{$referenceUrl := printf "%s#%s" $.Issue.Link (index .comments 0).HashTag}}
|
|
<div class="conversation-holder" data-path="{{(index .comments 0).TreePath}}" data-side="{{if lt (index .comments 0).Line 0}}left{{else}}right{{end}}" data-idx="{{(index .comments 0).UnsignedLine}}">
|
|
{{if $resolved}}
|
|
<div class="ui attached header resolved-placeholder gt-df gt-ac gt-sb">
|
|
<div class="ui grey text gt-df gt-ac gt-fw gt-gap-2">
|
|
{{svg "octicon-check" 16 "icon gt-mr-2"}}
|
|
<b>{{$resolveDoer.Name}}</b> {{$.locale.Tr "repo.issues.review.resolved_by"}}
|
|
{{if $invalid}}
|
|
<!--
|
|
We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above).
|
|
The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl
|
|
-->
|
|
<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small gt-ml-3" data-tooltip-content="{{$.locale.Tr "repo.issues.review.outdated_description"}}">
|
|
{{$.locale.Tr "repo.issues.review.outdated"}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
<div class="gt-df gt-ac gt-gap-3">
|
|
<button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button show-outdated gt-df gt-ac">
|
|
{{svg "octicon-unfold" 16 "gt-mr-3"}}
|
|
{{$.locale.Tr "repo.issues.review.show_resolved"}}
|
|
</button>
|
|
<button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button hide-outdated gt-df gt-ac gt-hidden">
|
|
{{svg "octicon-fold" 16 "gt-mr-3"}}
|
|
{{$.locale.Tr "repo.issues.review.hide_resolved"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
<div id="code-comments-{{(index .comments 0).ID}}" class="field comment-code-cloud {{if $resolved}}gt-hidden{{end}}">
|
|
<div class="comment-list">
|
|
<ui class="ui comments">
|
|
{{template "repo/diff/comments" dict "root" $ "comments" .comments}}
|
|
</ui>
|
|
</div>
|
|
<div class="gt-df gt-je gt-js-small gt-ac gt-fw gt-mt-3">
|
|
<div class="ui buttons gt-mr-2">
|
|
<button class="ui icon tiny basic button previous-conversation">
|
|
{{svg "octicon-arrow-up" 12 "icon"}} {{$.locale.Tr "repo.issues.previous"}}
|
|
</button>
|
|
<button class="ui icon tiny basic button next-conversation">
|
|
{{svg "octicon-arrow-down" 12 "icon"}} {{$.locale.Tr "repo.issues.next"}}
|
|
</button>
|
|
</div>
|
|
{{if and $.CanMarkConversation $isNotPending}}
|
|
<button class="ui icon tiny basic button resolve-conversation" data-origin="diff" 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}}
|
|
{{$.locale.Tr "repo.issues.review.un_resolve_conversation"}}
|
|
{{else}}
|
|
{{$.locale.Tr "repo.issues.review.resolve_conversation"}}
|
|
{{end}}
|
|
</button>
|
|
{{end}}
|
|
{{if and $.SignedUserID (not $.Repository.IsArchived)}}
|
|
<button class="comment-form-reply ui green tiny labeled icon button gt-ml-2 gt-mr-0">
|
|
{{svg "octicon-reply" 16 "reply icon gt-mr-2"}}{{$.locale.Tr "repo.diff.comment.reply"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index .comments 0).ReviewID "root" $ "comment" (index .comments 0)}}
|
|
</div>
|
|
</div>
|