thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Merge pull request 'Revert "[UI] Revert "Remove ONLY_SHOW_RELEVANT_REPOS setting""' (#473) from earl-warren/forgejo:wip-relevant into forgejo-development

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/473
This commit is contained in:
Loïc Dachary 2023-03-02 10:47:55 +00:00
commit 48fc2382ab
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
routers/web/explore/repo.go
View file

@ -17,7 +17,8 @@ import (
const ( const (
// tplExploreRepos explore repositories page template // tplExploreRepos explore repositories page template
tplExploreRepos base.TplName = "explore/repos" tplExploreRepos base.TplName = "explore/repos"
relevantReposOnlyParam string = "no_filter"
) )
// RepoSearchOptions when calling search repositories // RepoSearchOptions when calling search repositories
@ -83,13 +84,9 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
default: default:
ctx.Data["SortType"] = "recentupdate" ctx.Data["SortType"] = "recentupdate"
orderBy = db.SearchOrderByRecentUpdated orderBy = db.SearchOrderByRecentUpdated
onlyShowRelevant = setting.UI.OnlyShowRelevantRepos && !ctx.FormBool("no_filter")
} }
keyword := ctx.FormTrim("q") keyword := ctx.FormTrim("q")
if keyword != "" {
onlyShowRelevant = false
}
ctx.Data["OnlyShowRelevant"] = opts.OnlyShowRelevant ctx.Data["OnlyShowRelevant"] = opts.OnlyShowRelevant
@ -141,7 +138,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
pager.SetDefaultParams(ctx) pager.SetDefaultParams(ctx)
pager.AddParam(ctx, "topic", "TopicOnly") pager.AddParam(ctx, "topic", "TopicOnly")
pager.AddParam(ctx, "language", "Language") pager.AddParam(ctx, "language", "Language")
pager.AddParamString("no_filter", ctx.FormString("no_filter")) pager.AddParamString(relevantReposOnlyParam, ctx.FormString(relevantReposOnlyParam))
ctx.Data["Page"] = pager ctx.Data["Page"] = pager
ctx.HTML(http.StatusOK, opts.TplName) ctx.HTML(http.StatusOK, opts.TplName)