mirror of
https://github.com/go-gitea/gitea.git
synced 2025-10-20 18:14:36 -04:00
c30d74d0f9
Fixes #32257 /claim #32257 Implemented commenting on unchanged lines in Pull Request diffs, lines are accessed by expanding the diff preview. Comments also appear in the "Files Changed" tab on the unchanged lines where they were placed. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
54 lines
2.8 KiB
Handlebars
54 lines
2.8 KiB
Handlebars
{{$file := .file}}
|
|
{{/* this tmpl is also used by the PR Conversation page, so the "AfterCommitID" and "DiffBlobExcerptData" may not exist */}}
|
|
{{$diffBlobExcerptData := $.root.DiffBlobExcerptData}}
|
|
<colgroup>
|
|
<col width="50">
|
|
<col width="50">
|
|
<col width="10">
|
|
<col width="10">
|
|
<col>
|
|
</colgroup>
|
|
{{range $j, $section := $file.Sections}}
|
|
{{range $k, $line := $section.Lines}}
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
|
|
{{if eq .GetType 4}}
|
|
{{if $.root.AfterCommitID}}
|
|
<td colspan="2" class="lines-num">{{$line.RenderBlobExcerptButtons $file.NameHash $diffBlobExcerptData}}</td>
|
|
{{else}}
|
|
{{/* for code file preview page or comment diffs on pull comment pages, do not show the expansion arrows */}}
|
|
<td colspan="2" class="lines-num"></td>
|
|
{{end}}
|
|
{{else}}
|
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
|
|
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
|
|
{{end}}
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale -}}
|
|
<td class="lines-escape">
|
|
{{- if $inlineDiff.EscapeStatus.Escaped -}}
|
|
<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>
|
|
{{- end -}}
|
|
</td>
|
|
<td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
|
{{if eq .GetType 4}}
|
|
<td class="chroma lines-code blob-hunk">{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td>
|
|
{{else}}
|
|
<td class="chroma lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}">
|
|
{{- if and $.root.SignedUserID $.root.PageIsPullFiles -}}
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-{{if $line.RightIdx}}right{{else}}left{{end}}{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="{{if $line.RightIdx}}right{{else}}left{{end}}" data-idx="{{if $line.RightIdx}}{{$line.RightIdx}}{{else}}{{$line.LeftIdx}}{{end}}">
|
|
{{- svg "octicon-plus" -}}
|
|
</button>
|
|
{{- end -}}
|
|
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
|
|
</td>
|
|
{{end}}
|
|
</tr>
|
|
{{if $line.Comments}}
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
|
<td class="add-comment-left add-comment-right" colspan="5">
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
{{end}}
|
|
{{end}}
|