Skip to content

Commit 6f5df4f

Browse files
snematodaGusted
authored andcommitted
fix(ui): fix typo in issue sort dropdown; relevance was misnamed as relevency (#12771)
closes #12769 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12771 Reviewed-by: Robert Wolff <mahlzahn@posteo.de>
1 parent 44b93ff commit 6f5df4f

2 files changed

Lines changed: 28 additions & 11 deletions

File tree

templates/repo/issue/filter_list.tmpl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,14 @@
148148
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
149149
<div class="menu">
150150
{{$keyword := StringUtils.RemoveAllPrefix $.Keyword "sort:"}}
151-
<a rel="nofollow" class="{{if or (eq .SortType "relevance") (not .SortType)}}active {{end}}item" href="?q={{$keyword}}&type={{$.ViewType}}&sort=relevency&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{ctx.Locale.Tr "repo.issues.filter_sort.relevance"}}</a>
152-
{{$o := .}}
153-
{{range $opt := StringUtils.Make "latest" "oldest" "recentupdate" "leastupdate" "mostcomment" "leastcomment" "nearduedate" "farduedate"}}
151+
{{$sortType := .SortType}}
152+
{{if not .SortType}}
153+
{{$sortType = "relevance"}}
154+
{{end}}
155+
156+
{{range $opt := StringUtils.Make "relevance" "latest" "oldest" "recentupdate" "leastupdate" "mostcomment" "leastcomment" "nearduedate" "farduedate"}}
154157
{{$text := ctx.Locale.Tr (printf "repo.issues.filter_sort.%s" $opt)}}
155-
<a rel="nofollow" class="{{if eq $o.SortType $opt}}active {{end}}item" href="?q={{$keyword}}&type={{$.ViewType}}&sort={{$opt}}&state={{$.State}}&labels={{$o.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{$text}}</a>
158+
<a rel="nofollow" class="{{if eq $sortType $opt}}active {{end}}item" href="?q={{$keyword}}&type={{$.ViewType}}&sort={{$opt}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{$text}}</a>
156159
{{end}}
157160
</div>
158161
</div>

tests/integration/issue_list_filters_test.go

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ package integration
55

66
import (
77
"net/http"
8+
"net/url"
89
"testing"
910

1011
"forgejo.org/modules/translation"
1112
"forgejo.org/tests"
1213

1314
"github.com/PuerkitoBio/goquery"
1415
"github.com/stretchr/testify/assert"
16+
"github.com/stretchr/testify/require"
1517
)
1618

1719
// Tests for contents of pages .../issues and .../pulls
@@ -45,9 +47,8 @@ func TestIssueSorting(t *testing.T) {
4547
htmlDoc.Find(`.list-header-sort .menu a`).Length(),
4648
"Wrong amount of sort options in dropdown")
4749

48-
menuItemsHTML := htmlDoc.Find(`.list-header-sort .menu`).Text()
4950
locale := translation.NewLocale("en-US")
50-
for _, key := range []string{
51+
keys := []string{
5152
"relevance",
5253
"latest",
5354
"oldest",
@@ -57,12 +58,25 @@ func TestIssueSorting(t *testing.T) {
5758
"leastcomment",
5859
"nearduedate",
5960
"farduedate",
60-
} {
61-
assert.Contains(t,
62-
menuItemsHTML,
63-
locale.Tr("repo.issues.filter_sort."+key),
64-
"Sort option %s ('%s') not found in dropdown", key, locale.Tr("repo.issues.filter_sort."+key))
6561
}
62+
63+
actual := htmlDoc.
64+
Find(`.list-header-sort .menu .item`).
65+
Map(func(i int, element *goquery.Selection) string {
66+
href, ok := element.Attr("href")
67+
assert.True(t, ok)
68+
69+
values, err := url.ParseQuery(href)
70+
require.NoError(t, err)
71+
assert.True(t, values.Has("sort"))
72+
73+
sort := values.Get("sort")
74+
assert.Contains(t, keys, sort)
75+
assert.Contains(t, element.Text(), locale.Tr("repo.issues.filter_sort."+sort))
76+
return sort
77+
})
78+
79+
assert.Equal(t, keys, actual)
6680
})
6781
}
6882

0 commit comments

Comments
 (0)