Merge pull request '[BUG] Remember topic only in repo search' (#2575) from gusted/forgejo-port-1 into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2575
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Gusted 2024-03-06 13:55:45 +00:00
commit d759bec64f
2 changed files with 14 additions and 0 deletions

View file

@ -1,6 +1,7 @@
<div class="ui secondary filter menu"> <div class="ui secondary filter menu">
<form id="repo-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-flex-row tw-gap-x-2"> <form id="repo-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-flex-row tw-gap-x-2">
{{if .Language}}<input hidden name="language" value="{{.Language}}">{{end}} {{if .Language}}<input hidden name="language" value="{{.Language}}">{{end}}
{{if .TopicOnly}}<input hidden name="topic" value="{{.TopicOnly}}">{{end}}
<div class="ui fluid action input tw-flex-1"> <div class="ui fluid action input tw-flex-1">
{{template "shared/searchinput" dict "Value" .Keyword}} {{template "shared/searchinput" dict "Value" .Keyword}}
{{if .PageIsExploreRepositories}} {{if .PageIsExploreRepositories}}

View file

@ -8,6 +8,8 @@ import (
"testing" "testing"
"code.gitea.io/gitea/tests" "code.gitea.io/gitea/tests"
"github.com/stretchr/testify/assert"
) )
func TestExploreRepos(t *testing.T) { func TestExploreRepos(t *testing.T) {
@ -15,4 +17,15 @@ func TestExploreRepos(t *testing.T) {
req := NewRequest(t, "GET", "/explore/repos") req := NewRequest(t, "GET", "/explore/repos")
MakeRequest(t, req, http.StatusOK) MakeRequest(t, req, http.StatusOK)
t.Run("Persistent parameters", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
req := NewRequest(t, "GET", "/explore/repos?topic=1&language=Go")
resp := MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body).Find("#repo-search-form")
assert.EqualValues(t, "Go", htmlDoc.Find("input[name='language']").AttrOr("value", "not found"))
assert.EqualValues(t, "true", htmlDoc.Find("input[name='topic']").AttrOr("value", "not found"))
})
} }