diff --git a/appview/pages/pages.go b/appview/pages/pages.go index fdbda92c..1965ecae 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -1258,14 +1258,13 @@ func (p *Pages) RepoCompareAllowPullFragment(w io.Writer, params RepoCompareAllo return p.executePlain("repo/fragments/compareAllowPull", w, params) } -type RepoCompareDiffParams struct { - LoggedInUser *oauth.User - RepoInfo repoinfo.RepoInfo - Diff types.NiceDiff +type RepoCompareDiffFragmentParams struct { + Diff types.NiceDiff + DiffOpts types.DiffOpts } -func (p *Pages) RepoCompareDiff(w io.Writer, params RepoCompareDiffParams) error { - return p.executePlain("repo/fragments/diff", w, []any{params.RepoInfo.FullName, ¶ms.Diff}) +func (p *Pages) RepoCompareDiffFragment(w io.Writer, params RepoCompareDiffFragmentParams) error { + return p.executePlain("repo/fragments/diff", w, []any{¶ms.Diff, ¶ms.DiffOpts}) } type LabelPanelParams struct { diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html index 1ee12893..3ce4902c 100644 --- a/appview/pages/templates/repo/commit.html +++ b/appview/pages/templates/repo/commit.html @@ -111,7 +111,7 @@ {{ end }} {{ define "contentAfter" }} - {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }} + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} {{end}} {{ define "contentAfterLeft" }} diff --git a/appview/pages/templates/repo/compare/compare.html b/appview/pages/templates/repo/compare/compare.html index b273b360..f94ba22a 100644 --- a/appview/pages/templates/repo/compare/compare.html +++ b/appview/pages/templates/repo/compare/compare.html @@ -42,7 +42,7 @@ {{ end }} {{ define "contentAfter" }} - {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }} + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} {{end}} {{ define "contentAfterLeft" }} diff --git a/appview/pages/templates/repo/fragments/diff.html b/appview/pages/templates/repo/fragments/diff.html index 1d6ceefd..1f17636a 100644 --- a/appview/pages/templates/repo/fragments/diff.html +++ b/appview/pages/templates/repo/fragments/diff.html @@ -1,7 +1,6 @@ {{ define "repo/fragments/diff" }} - {{ $repo := index . 0 }} - {{ $diff := index . 1 }} - {{ $opts := index . 2 }} + {{ $diff := index . 0 }} + {{ $opts := index . 1 }} {{ $commit := $diff.Commit }} {{ $diff := $diff.Diff }} diff --git a/appview/pages/templates/repo/pulls/patch.html b/appview/pages/templates/repo/pulls/patch.html index 3bb580f2..52d72d30 100644 --- a/appview/pages/templates/repo/pulls/patch.html +++ b/appview/pages/templates/repo/pulls/patch.html @@ -54,7 +54,7 @@ {{ end }} {{ define "contentAfter" }} - {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }} + {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} {{end}} {{ define "contentAfterLeft" }}