back round 0 view raw

appview/pages: fix `pages.RepoComparedDiffFragment()` #811

merged

opened by

boltless.me 4 weeks ago targeting master from sl/yurolxtlpsmz

remove unused parameters
pass correct parameters
rename with *Fragment suffix

Signed-off-by: Seongmin Lee git@boltless.me

options

unified split

Changed files

+10 -12

appview

pages

pages.go

templates

repo

commit.html

compare

compare.html

fragments

diff.html

pulls

patch.html

+5 -6

appview/pages/pages.go

···

       1247
        
       	return p.executePlain("repo/fragments/compareAllowPull", w, params)

     

       1248
        
       }

     

       1249
        
       

     

       1250
       -
       type RepoCompareDiffParams struct {

     

       1251
       -
       	LoggedInUser *oauth.User

     

       1252
       -
       	RepoInfo     repoinfo.RepoInfo

     

       1253
       -
       	Diff         types.NiceDiff

     

       1254
        
       }

     

       1255
        
       

     

       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})

     

       1258
        
       }

     

       1259
        
       

     

       1260
        
       type LabelPanelParams struct {

···

       1247
        
       	return p.executePlain("repo/fragments/compareAllowPull", w, params)

     

       1248
        
       }

     

       1249
        
       

     

       1250
       +
       type RepoCompareDiffFragmentParams struct {

     

       1251
       +
       	Diff     types.NiceDiff

     

       1252
       +
       	DiffOpts types.DiffOpts

     

       0
        
       
     

       1253
        
       }

     

       1254
        
       

     

       1255
       +
       func (p *Pages) RepoCompareDiffFragment(w io.Writer, params RepoCompareDiffFragmentParams) error {

     

       1256
       +
       	return p.executePlain("repo/fragments/diff", w, []any{&params.Diff, &params.DiffOpts})

     

       1257
        
       }

     

       1258
        
       

     

       1259
        
       type LabelPanelParams struct {

+1 -1

appview/pages/templates/repo/commit.html

···

       111
        
       {{ end }}

     

       112
        
       

     

       113
        
       {{ define "contentAfter" }}

     

       114
       -
         {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }}

     

       115
        
       {{end}}

     

       116
        
       

     

       117
        
       {{ define "contentAfterLeft" }}

···

       111
        
       {{ end }}

     

       112
        
       

     

       113
        
       {{ define "contentAfter" }}

     

       114
       +
         {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }}

     

       115
        
       {{end}}

     

       116
        
       

     

       117
        
       {{ define "contentAfterLeft" }}

+1 -1

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

···

       42
        
       {{ end }}

     

       43
        
       

     

       44
        
       {{ define "contentAfter" }}

     

       45
       -
         {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }}

     

       46
        
       {{end}}

     

       47
        
       

     

       48
        
       {{ define "contentAfterLeft" }}

···

       42
        
       {{ end }}

     

       43
        
       

     

       44
        
       {{ define "contentAfter" }}

     

       45
       +
         {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }}

     

       46
        
       {{end}}

     

       47
        
       

     

       48
        
       {{ define "contentAfterLeft" }}

+2 -3

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

···

       1
        
       {{ define "repo/fragments/diff" }}

     

       2
       -
         {{ $repo := index . 0 }}

     

       3
       -
         {{ $diff := index . 1 }}

     

       4
       -
         {{ $opts := index . 2 }}

     

       5
        
       

     

       6
        
         {{ $commit := $diff.Commit }}

     

       7
        
         {{ $diff := $diff.Diff }}

···

       1
        
       {{ define "repo/fragments/diff" }}

     

       2
       +
         {{ $diff := index . 0 }}

     

       3
       +
         {{ $opts := index . 1 }}

     

       0
        
       
     

       4
        
       

     

       5
        
         {{ $commit := $diff.Commit }}

     

       6
        
         {{ $diff := $diff.Diff }}

+1 -1

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

···

       54
        
       {{ end }}

     

       55
        
       

     

       56
        
       {{ define "contentAfter" }}

     

       57
       -
         {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff .DiffOpts) }}

     

       58
        
       {{end}}

     

       59
        
       

     

       60
        
       {{ define "contentAfterLeft" }}

···

       54
        
       {{ end }}

     

       55
        
       

     

       56
        
       {{ define "contentAfter" }}

     

       57
       +
         {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }}

     

       58
        
       {{end}}

     

       59
        
       

     

       60
        
       {{ define "contentAfterLeft" }}