Add missing repository type filter parameters to pager (#31832)
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? (cherry picked from commit 7092402a2db255ecde2c20574b973fb632c16d2e) Conflicts: routers/web/org/home.go trivial conflict s/pager.AddParam/pager.AddParamString/
This commit is contained in:
parent
1dfa11551c
commit
a8e25e907c
@ -144,6 +144,21 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
|
|||||||
pager.AddParam(ctx, "topic", "TopicOnly")
|
pager.AddParam(ctx, "topic", "TopicOnly")
|
||||||
pager.AddParam(ctx, "language", "Language")
|
pager.AddParam(ctx, "language", "Language")
|
||||||
pager.AddParamString(relevantReposOnlyParam, fmt.Sprint(opts.OnlyShowRelevant))
|
pager.AddParamString(relevantReposOnlyParam, fmt.Sprint(opts.OnlyShowRelevant))
|
||||||
|
if archived.Has() {
|
||||||
|
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
|
||||||
|
}
|
||||||
|
if fork.Has() {
|
||||||
|
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
|
||||||
|
}
|
||||||
|
if mirror.Has() {
|
||||||
|
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
|
||||||
|
}
|
||||||
|
if template.Has() {
|
||||||
|
pager.AddParamString("template", fmt.Sprint(template.Value()))
|
||||||
|
}
|
||||||
|
if private.Has() {
|
||||||
|
pager.AddParamString("private", fmt.Sprint(private.Value()))
|
||||||
|
}
|
||||||
ctx.Data["Page"] = pager
|
ctx.Data["Page"] = pager
|
||||||
|
|
||||||
ctx.HTML(http.StatusOK, opts.TplName)
|
ctx.HTML(http.StatusOK, opts.TplName)
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
package org
|
package org
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
@ -154,7 +155,22 @@ func Home(ctx *context.Context) {
|
|||||||
|
|
||||||
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
|
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
|
||||||
pager.SetDefaultParams(ctx)
|
pager.SetDefaultParams(ctx)
|
||||||
pager.AddParam(ctx, "language", "Language")
|
pager.AddParamString("language", language)
|
||||||
|
if archived.Has() {
|
||||||
|
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
|
||||||
|
}
|
||||||
|
if fork.Has() {
|
||||||
|
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
|
||||||
|
}
|
||||||
|
if mirror.Has() {
|
||||||
|
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
|
||||||
|
}
|
||||||
|
if template.Has() {
|
||||||
|
pager.AddParamString("template", fmt.Sprint(template.Value()))
|
||||||
|
}
|
||||||
|
if private.Has() {
|
||||||
|
pager.AddParamString("private", fmt.Sprint(private.Value()))
|
||||||
|
}
|
||||||
ctx.Data["Page"] = pager
|
ctx.Data["Page"] = pager
|
||||||
|
|
||||||
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
|
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0
|
||||||
|
@ -446,6 +446,21 @@ func NotificationWatching(ctx *context.Context) {
|
|||||||
// redirect to last page if request page is more than total pages
|
// redirect to last page if request page is more than total pages
|
||||||
pager := context.NewPagination(total, setting.UI.User.RepoPagingNum, page, 5)
|
pager := context.NewPagination(total, setting.UI.User.RepoPagingNum, page, 5)
|
||||||
pager.SetDefaultParams(ctx)
|
pager.SetDefaultParams(ctx)
|
||||||
|
if archived.Has() {
|
||||||
|
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
|
||||||
|
}
|
||||||
|
if fork.Has() {
|
||||||
|
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
|
||||||
|
}
|
||||||
|
if mirror.Has() {
|
||||||
|
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
|
||||||
|
}
|
||||||
|
if template.Has() {
|
||||||
|
pager.AddParamString("template", fmt.Sprint(template.Value()))
|
||||||
|
}
|
||||||
|
if private.Has() {
|
||||||
|
pager.AddParamString("private", fmt.Sprint(private.Value()))
|
||||||
|
}
|
||||||
ctx.Data["Page"] = pager
|
ctx.Data["Page"] = pager
|
||||||
|
|
||||||
ctx.Data["Status"] = 2
|
ctx.Data["Status"] = 2
|
||||||
|
@ -335,6 +335,21 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
|
|||||||
if tab == "activity" {
|
if tab == "activity" {
|
||||||
pager.AddParam(ctx, "date", "Date")
|
pager.AddParam(ctx, "date", "Date")
|
||||||
}
|
}
|
||||||
|
if archived.Has() {
|
||||||
|
pager.AddParamString("archived", fmt.Sprint(archived.Value()))
|
||||||
|
}
|
||||||
|
if fork.Has() {
|
||||||
|
pager.AddParamString("fork", fmt.Sprint(fork.Value()))
|
||||||
|
}
|
||||||
|
if mirror.Has() {
|
||||||
|
pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
|
||||||
|
}
|
||||||
|
if template.Has() {
|
||||||
|
pager.AddParamString("template", fmt.Sprint(template.Value()))
|
||||||
|
}
|
||||||
|
if private.Has() {
|
||||||
|
pager.AddParamString("private", fmt.Sprint(private.Value()))
|
||||||
|
}
|
||||||
ctx.Data["Page"] = pager
|
ctx.Data["Page"] = pager
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user