mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 17:44:27 +00:00
Reply button is not removed when deleting a code review comment (#13824)
Backport #13774
This commit is contained in:
parent
0d43a2a069
commit
10fff12da4
@ -166,6 +166,7 @@
|
||||
<td class="lines-num"></td>
|
||||
<td class="lines-type-marker"></td>
|
||||
<td class="add-comment-left">
|
||||
<div class="conversation-holder">
|
||||
{{if and $resolved (eq $line.GetCommentSide "previous")}}
|
||||
<div class="ui top attached header">
|
||||
<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span>
|
||||
@ -198,10 +199,12 @@
|
||||
{{end}}
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</td>
|
||||
<td class="lines-num"></td>
|
||||
<td class="lines-type-marker"></td>
|
||||
<td class="add-comment-right">
|
||||
<div class="conversation-holder">
|
||||
{{if and $resolved (eq $line.GetCommentSide "proposed")}}
|
||||
<div class="ui top attached header">
|
||||
<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.i18n.Tr "repo.issues.review.resolved_by"}}</span>
|
||||
@ -234,6 +237,7 @@
|
||||
{{end}}
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
|
@ -39,6 +39,7 @@
|
||||
<tr>
|
||||
<td colspan="2" class="lines-num"></td>
|
||||
<td class="add-comment-left add-comment-right" colspan="2">
|
||||
<div class="conversation-holder">
|
||||
{{if $resolved}}
|
||||
<div class = "ui attached header">
|
||||
<span class="ui grey text left"><b>{{$resolveDoer.Name}}</b> {{$.root.i18n.Tr "repo.issues.review.resolved_by"}}</span>
|
||||
@ -69,6 +70,7 @@
|
||||
</button>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
|
@ -1055,7 +1055,11 @@ async function initRepository() {
|
||||
$.post($this.data('url'), {
|
||||
_csrf: csrf
|
||||
}).done(() => {
|
||||
const $conversationHolder = $this.closest('.conversation-holder');
|
||||
$(`#${$this.data('comment-id')}`).remove();
|
||||
if ($conversationHolder.length && !$conversationHolder.find('.comment').length) {
|
||||
$conversationHolder.remove();
|
||||
}
|
||||
});
|
||||
}
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user