mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-02-22 13:57:46 -05:00
fix: set explore pages to configurable default sort (#6708)
- Currently, the explore/organizations page always defaults to using "newest" as its sort. Instead, use the pre-existing config option (`setting.UI.ExploreDefaultSort`) so server administrators can change the default sort order. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6708 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: John Moon <john.moon@vts-i.com> Co-committed-by: John Moon <john.moon@vts-i.com>
This commit is contained in:
parent
226994a6df
commit
4ef00fe6f9
4 changed files with 65 additions and 3 deletions
|
@ -39,7 +39,11 @@ func Organizations(ctx *context.Context) {
|
||||||
)
|
)
|
||||||
sortOrder := ctx.FormString("sort")
|
sortOrder := ctx.FormString("sort")
|
||||||
if sortOrder == "" {
|
if sortOrder == "" {
|
||||||
|
if supportedSortOrders.Contains(setting.UI.ExploreDefaultSort) {
|
||||||
|
sortOrder = setting.UI.ExploreDefaultSort
|
||||||
|
} else {
|
||||||
sortOrder = "newest"
|
sortOrder = "newest"
|
||||||
|
}
|
||||||
ctx.SetFormString("sort", sortOrder)
|
ctx.SetFormString("sort", sortOrder)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -151,7 +151,11 @@ func Users(ctx *context.Context) {
|
||||||
)
|
)
|
||||||
sortOrder := ctx.FormString("sort")
|
sortOrder := ctx.FormString("sort")
|
||||||
if sortOrder == "" {
|
if sortOrder == "" {
|
||||||
|
if supportedSortOrders.Contains(setting.UI.ExploreDefaultSort) {
|
||||||
|
sortOrder = setting.UI.ExploreDefaultSort
|
||||||
|
} else {
|
||||||
sortOrder = "newest"
|
sortOrder = "newest"
|
||||||
|
}
|
||||||
ctx.SetFormString("sort", sortOrder)
|
ctx.SetFormString("sort", sortOrder)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
49
tests/integration/explore_org_test.go
Normal file
49
tests/integration/explore_org_test.go
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/test"
|
||||||
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestExploreOrg(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
// Set the default sort order
|
||||||
|
defer test.MockVariableValue(&setting.UI.ExploreDefaultSort, "alphabetically")()
|
||||||
|
|
||||||
|
cases := []struct{ sortOrder, expected string }{
|
||||||
|
{"", "?sort=" + setting.UI.ExploreDefaultSort + "&q="},
|
||||||
|
{"newest", "?sort=newest&q="},
|
||||||
|
{"oldest", "?sort=oldest&q="},
|
||||||
|
{"alphabetically", "?sort=alphabetically&q="},
|
||||||
|
{"reversealphabetically", "?sort=reversealphabetically&q="},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
req := NewRequest(t, "GET", "/explore/organizations?sort="+c.sortOrder)
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
h := NewHTMLParser(t, resp.Body)
|
||||||
|
href, _ := h.Find(`.ui.dropdown .menu a.active.item[href^="?sort="]`).Attr("href")
|
||||||
|
assert.Equal(t, c.expected, href)
|
||||||
|
}
|
||||||
|
|
||||||
|
// these sort orders shouldn't be supported, to avoid leaking user activity
|
||||||
|
cases404 := []string{
|
||||||
|
"/explore/organizations?sort=mostMembers",
|
||||||
|
"/explore/organizations?sort=leastGroups",
|
||||||
|
"/explore/organizations?sort=leastupdate",
|
||||||
|
"/explore/organizations?sort=reverseleastupdate",
|
||||||
|
}
|
||||||
|
for _, c := range cases404 {
|
||||||
|
req := NewRequest(t, "GET", c).SetHeader("Accept", "text/html")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
}
|
|
@ -7,6 +7,8 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/test"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
@ -15,8 +17,11 @@ import (
|
||||||
func TestExploreUser(t *testing.T) {
|
func TestExploreUser(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
// Set the default sort order
|
||||||
|
defer test.MockVariableValue(&setting.UI.ExploreDefaultSort, "reversealphabetically")()
|
||||||
|
|
||||||
cases := []struct{ sortOrder, expected string }{
|
cases := []struct{ sortOrder, expected string }{
|
||||||
{"", "?sort=newest&q="},
|
{"", "?sort=" + setting.UI.ExploreDefaultSort + "&q="},
|
||||||
{"newest", "?sort=newest&q="},
|
{"newest", "?sort=newest&q="},
|
||||||
{"oldest", "?sort=oldest&q="},
|
{"oldest", "?sort=oldest&q="},
|
||||||
{"alphabetically", "?sort=alphabetically&q="},
|
{"alphabetically", "?sort=alphabetically&q="},
|
||||||
|
|
Loading…
Add table
Reference in a new issue