commit fd370d261ff5bc95e872736d3eb20fbc5008e802 · julien.rbrt.fr/tangled-core

+5 -6

appview/pages/pages.go

··· 1247 1247 return p.executePlain("repo/fragments/compareAllowPull", w, params) 1248 1248 } 1249 1249 1250 - type RepoCompareDiffParams struct { 1251 - LoggedInUser *oauth.User 1252 - RepoInfo repoinfo.RepoInfo 1253 - Diff types.NiceDiff 1250 + type RepoCompareDiffFragmentParams struct { 1251 + Diff types.NiceDiff 1252 + DiffOpts types.DiffOpts 1254 1253 } 1255 1254 1256 - func (p *Pages) RepoCompareDiff(w io.Writer, params RepoCompareDiffParams) error { 1257 - return p.executePlain("repo/fragments/diff", w, []any{params.RepoInfo.FullName, &params.Diff}) 1255 + func (p *Pages) RepoCompareDiffFragment(w io.Writer, params RepoCompareDiffFragmentParams) error { 1256 + return p.executePlain("repo/fragments/diff", w, []any{&params.Diff, &params.DiffOpts}) 1258 1257 } 1259 1258 1260 1259 type LabelPanelParams struct {

+1 -1

appview/pages/templates/repo/commit.html

··· 111 111 {{ end }} 112 112 113 113 {{ define "contentAfter" }} 114 - {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }} 114 + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 115 115 {{end}} 116 116 117 117 {{ define "contentAfterLeft" }}

+1 -1

appview/pages/templates/repo/compare/compare.html

··· 42 42 {{ end }} 43 43 44 44 {{ define "contentAfter" }} 45 - {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }} 45 + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 46 46 {{end}} 47 47 48 48 {{ define "contentAfterLeft" }}

+2 -3

appview/pages/templates/repo/fragments/diff.html

··· 1 1 {{ define "repo/fragments/diff" }} 2 - {{ $repo := index . 0 }} 3 - {{ $diff := index . 1 }} 4 - {{ $opts := index . 2 }} 2 + {{ $diff := index . 0 }} 3 + {{ $opts := index . 1 }} 5 4 6 5 {{ $commit := $diff.Commit }} 7 6 {{ $diff := $diff.Diff }}

+1 -1

appview/pages/templates/repo/pulls/patch.html

··· 54 54 {{ end }} 55 55 56 56 {{ define "contentAfter" }} 57 - {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }} 57 + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 58 58 {{end}} 59 59 60 60 {{ define "contentAfterLeft" }}