fix: Combined pagination fix, construct page titles correctly, history set incorrectly in certain cases
1 file changed, 14 insertions(+), 3 deletions(-)
changed files
M internal/server/global.go → internal/server/global.go
@@ -6,6 +6,7 @@ "encoding/xml" "fmt" "math" "net/http" + "net/url" "strconv" "alin.ovh/x/log"@@ -56,6 +57,17 @@ return h } +func searchURL(source config.Source) *url.URL { + if source.Importer == config.All { + return &url.URL{Path: "/"} + } + + searchURL := *source.LocalURL() + searchURL.Path += "search" + + return &searchURL +} + func (g *GlobalHandler) ExecuteSearch( source config.Source, r *http.Request,@@ -124,8 +136,7 @@ if source.Importer != config.All { searchDesc += " in " + source.Name } - searchURL := *source.LocalURL() - searchURL.Path += "search" + searchURL := searchURL(source) searchQuery := r.URL.Query() searchQuery.Del("scoped") searchURL.RawQuery = searchQuery.Encode()@@ -140,7 +151,7 @@ Query: qs, Title: g.getTitle(source, qs), Description: searchDesc, BaseURL: g.cfg.Web.BaseURL, - SearchNav: components.NewSearchNav(searchURL).WithPagination(page), + SearchNav: components.NewSearchNav(*searchURL).WithPagination(page), }, Query: qs, FacetQueries: facets,