Skip to content

Commit 771fb45

Browse files
GiteaBotyp05327
andauthored
Add missing repository type filter parameters to pager (#31832) (#31837)
Backport #31832 by @yp05327 Fix #31807 ps: the newly added params's value will be changed. When the first time you selected the filter, the values of params will be `0` or `1` But in pager it will be `true` or `false`. So do we have `boolToInt` function? Co-authored-by: yp05327 <[email protected]>
1 parent 5fa90ad commit 771fb45

File tree

4 files changed

+61
-0
lines changed

4 files changed

+61
-0
lines changed

routers/web/explore/repo.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,21 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
172172
pager.AddParamString("topic", fmt.Sprint(topicOnly))
173173
pager.AddParamString("language", language)
174174
pager.AddParamString(relevantReposOnlyParam, fmt.Sprint(opts.OnlyShowRelevant))
175+
if archived.Has() {
176+
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
177+
}
178+
if fork.Has() {
179+
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
180+
}
181+
if mirror.Has() {
182+
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
183+
}
184+
if template.Has() {
185+
pager.AddParamString("template", fmt.Sprint(template.Value()))
186+
}
187+
if private.Has() {
188+
pager.AddParamString("private", fmt.Sprint(private.Value()))
189+
}
175190
ctx.Data["Page"] = pager
176191

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

routers/web/org/home.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package org
55

66
import (
7+
"fmt"
78
"net/http"
89
"path"
910
"strings"
@@ -155,6 +156,21 @@ func Home(ctx *context.Context) {
155156
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
156157
pager.SetDefaultParams(ctx)
157158
pager.AddParamString("language", language)
159+
if archived.Has() {
160+
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
161+
}
162+
if fork.Has() {
163+
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
164+
}
165+
if mirror.Has() {
166+
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
167+
}
168+
if template.Has() {
169+
pager.AddParamString("template", fmt.Sprint(template.Value()))
170+
}
171+
if private.Has() {
172+
pager.AddParamString("private", fmt.Sprint(private.Value()))
173+
}
158174
ctx.Data["Page"] = pager
159175

160176
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0

routers/web/user/notification.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,21 @@ func NotificationWatching(ctx *context.Context) {
439439
// redirect to last page if request page is more than total pages
440440
pager := context.NewPagination(total, setting.UI.User.RepoPagingNum, page, 5)
441441
pager.SetDefaultParams(ctx)
442+
if archived.Has() {
443+
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
444+
}
445+
if fork.Has() {
446+
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
447+
}
448+
if mirror.Has() {
449+
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
450+
}
451+
if template.Has() {
452+
pager.AddParamString("template", fmt.Sprint(template.Value()))
453+
}
454+
if private.Has() {
455+
pager.AddParamString("private", fmt.Sprint(private.Value()))
456+
}
442457
ctx.Data["Page"] = pager
443458

444459
ctx.Data["Status"] = 2

routers/web/user/profile.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,21 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
333333
pager.AddParamString("date", fmt.Sprint(ctx.Data["Date"]))
334334
}
335335
}
336+
if archived.Has() {
337+
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
338+
}
339+
if fork.Has() {
340+
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
341+
}
342+
if mirror.Has() {
343+
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
344+
}
345+
if template.Has() {
346+
pager.AddParamString("template", fmt.Sprint(template.Value()))
347+
}
348+
if private.Has() {
349+
pager.AddParamString("private", fmt.Sprint(private.Value()))
350+
}
336351
ctx.Data["Page"] = pager
337352
}
338353

0 commit comments

Comments
 (0)