Skip to content

fix: Exclude code expansion arrows when DiffBlobExcerptData is not available. #36060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lunny merged 5 commits into from
Dec 5, 2025
Merged

fix: Exclude code expansion arrows when DiffBlobExcerptData is not available. #36060

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28361a1
fix: add diff blob excerpt data to pull review context
brymut Nov 30, 2025
3e4f434
exclude blob excerpt expand
brymut Dec 3, 2025
3d6c785
Update templates/repo/diff/section_unified.tmpl
wxiaoguang Dec 3, 2025
319113d
Merge branch 'main' into fix/include-diffBlobExcerptData-in-pull-conv
GiteaBot Dec 4, 2025
52537e2
Merge branch 'main' into fix/include-diffBlobExcerptData-in-pull-conv
GiteaBot Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/repo/diff/section_unified.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{$file := .file}}
{{/* this tmpl is also used by the PR Conversation page, so the "AfterCommitID" and "DiffBlobExcerptData" may not exist */}}
{{/* this tmpl is also used by the PR Conversation page, so "DiffBlobExcerptData" may not exist */}}
{{$diffBlobExcerptData := $.root.DiffBlobExcerptData}}
<colgroup>
<col width="50">
Expand All @@ -12,10 +12,10 @@
{{range $k, $line := $section.Lines}}
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
{{if eq .GetType 4}}
{{if $.root.AfterCommitID}}
{{if $diffBlobExcerptData}}
<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 */}}
{{/* when DiffBlobExcerptData is not available (code file preview, pull conversation diff comment), do not show the expansion arrows */}}
<td colspan="2" class="lines-num"></td>
{{end}}
{{else}}
Expand Down