Skip to content

Commit fedf219

Browse files
wxiaoguangwxiaoguang
authored
refactor: pagination/pager (#39162)
1 parent 9297205 commit fedf219

42 files changed

Lines changed: 133 additions & 131 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎routers/web/admin/badges.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func BadgeUsers(ctx *context.Context) {
203203

204204
ctx.Data["Users"] = users
205205
ctx.Data["Total"] = count
206-
ctx.Data["Page"] = context.NewPagination(count, setting.UI.Admin.UserPagingNum, page, 5)
206+
ctx.Data["Page"] = context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(setting.UI.Admin.UserPagingNum).CurPage(page).Build()
207207

208208
ctx.HTML(http.StatusOK, tplBadgeUsers)
209209
}
@@ -308,8 +308,7 @@ func RenderBadgeSearch(ctx *context.Context, opts *user_model.SearchBadgeOptions
308308
ctx.Data["Total"] = count
309309
ctx.Data["Badges"] = badges
310310

311-
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
312-
pager.AddParamFromRequest(ctx.Req)
311+
pager := context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(opts.PageSize).CurPage(opts.Page).Build()
313312
ctx.Data["Page"] = pager
314313

315314
ctx.HTML(http.StatusOK, tplName)

‎routers/web/admin/emails.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ func Emails(ctx *context.Context) {
9393
ctx.Data["Total"] = count
9494
ctx.Data["Emails"] = emails
9595

96-
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
97-
pager.AddParamFromRequest(ctx.Req)
96+
pager := context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(opts.PageSize).CurPage(opts.Page).Build()
9897
ctx.Data["Page"] = pager
9998

10099
ctx.HTML(http.StatusOK, tplEmails)

‎routers/web/admin/notice.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func Notices(ctx *context.Context) {
3737

3838
ctx.Data["Total"] = total
3939

40-
ctx.Data["Page"] = context.NewPagination(total, setting.UI.Admin.NoticePagingNum, page, 5)
40+
ctx.Data["Page"] = context.NewPagerBuilder(ctx).TotalCount(total).PerPageLimit(setting.UI.Admin.NoticePagingNum).CurPage(page).Build()
4141

4242
ctx.HTML(http.StatusOK, tplNotices)
4343
}

‎routers/web/admin/packages.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ func Packages(ctx *context.Context) {
7373
ctx.Data["TotalBlobSize"] = totalBlobSize - totalUnreferencedBlobSize
7474
ctx.Data["TotalUnreferencedBlobSize"] = totalUnreferencedBlobSize
7575

76-
pager := context.NewPagination(total, setting.UI.PackagesPagingNum, page, 5)
77-
pager.AddParamFromRequest(ctx.Req)
76+
pager := context.NewPagerBuilder(ctx).TotalCount(total).PerPageLimit(setting.UI.PackagesPagingNum).CurPage(page).Build()
7877
ctx.Data["Page"] = pager
7978

8079
ctx.HTML(http.StatusOK, tplPackagesList)

‎routers/web/admin/repos.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ func UnadoptedRepos(ctx *context.Context) {
8383
q := ctx.FormString("q")
8484

8585
if !doSearch {
86-
pager := context.NewPagination(0, opts.PageSize, opts.Page, 5)
87-
pager.AddParamFromRequest(ctx.Req)
86+
pager := context.NewPagerBuilder(ctx).TotalCount(0).PerPageLimit(opts.PageSize).CurPage(opts.Page).Build()
8887
ctx.Data["Page"] = pager
8988
ctx.HTML(http.StatusOK, tplUnadoptedRepos)
9089
return
@@ -97,8 +96,7 @@ func UnadoptedRepos(ctx *context.Context) {
9796
return
9897
}
9998
ctx.Data["Dirs"] = repoNames
100-
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
101-
pager.AddParamFromRequest(ctx.Req)
99+
pager := context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(opts.PageSize).CurPage(opts.Page).Build()
102100
ctx.Data["Page"] = pager
103101
ctx.HTML(http.StatusOK, tplUnadoptedRepos)
104102
}

‎routers/web/explore/code.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ func Code(ctx *context.Context) {
123123
ctx.Data["SearchResults"] = searchResults
124124
ctx.Data["SearchResultLanguages"] = searchResultLanguages
125125

126-
pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5)
127-
pager.AddParamFromRequest(ctx.Req)
126+
pager := context.NewPagerBuilder(ctx).TotalCount(total).PerPageLimit(setting.UI.RepoSearchPagingNum).CurPage(page).Build()
128127
ctx.Data["Page"] = pager
129128

130129
ctx.HTML(http.StatusOK, tplExploreCode)

‎routers/web/explore/repo.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
137137
ctx.Data["Repos"] = repos
138138
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
139139

140-
pager := context.NewPagination(count, opts.PageSize, page, 5)
141-
pager.AddParamFromRequest(ctx.Req)
140+
pager := context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(opts.PageSize).CurPage(page).Build()
142141
ctx.Data["Page"] = pager
143142

144143
ctx.HTML(http.StatusOK, opts.TplName)

‎routers/web/explore/user.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ func RenderUserSearch(ctx *context.Context, opts user_model.SearchUserOptions, t
115115
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail
116116
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
117117

118-
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
119-
pager.AddParamFromRequest(ctx.Req)
118+
pager := context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(opts.PageSize).CurPage(opts.Page).Build()
120119
ctx.Data["Page"] = pager
121120

122121
ctx.HTML(http.StatusOK, tplName)

‎routers/web/org/home.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ func home(ctx *context.Context, viewRepositories bool) {
161161
ctx.Data["Repos"] = repos
162162
ctx.Data["Total"] = count
163163

164-
pager := context.NewPagination(count, setting.UI.User.RepoPagingNum, page, 5)
165-
pager.AddParamFromRequest(ctx.Req)
164+
pager := context.NewPagerBuilder(ctx).TotalCount(count).PerPageLimit(setting.UI.User.RepoPagingNum).CurPage(page).Build()
166165
ctx.Data["Page"] = pager
167166

168167
ctx.HTML(http.StatusOK, tplOrgHome)

‎routers/web/org/members.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ func Members(ctx *context.Context) {
6262
}
6363

6464
pageSize := setting.UI.MembersPagingNum
65-
pager := context.NewPagination(total, pageSize, page, 5)
66-
pager.AddParamFromRequest(ctx.Req)
67-
opts.ListOptions.Page = pager.Paginater.Current()
65+
pager := context.NewPagerBuilder(ctx).TotalCount(total).PerPageLimit(pageSize).CurPage(page).Build()
66+
opts.ListOptions.Page = pager.Paginator.Current()
6867
opts.ListOptions.PageSize = pageSize
6968
members, membersIsPublic, err := organization.FindOrgMembers(ctx, opts)
7069
if err != nil {

0 commit comments

Comments
 (0)