Fix query parameter concatenation when JavaScript is disabled

fixes #116
Debian · Sep 29, 2022 · e8b7f51 · e8b7f51
1 parent a3edd9e
commit e8b7f51
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/cmd/dcs-web/serverrendered.go b/cmd/dcs-web/serverrendered.go
@@ -178,6 +178,9 @@ func renderPerPackage(w http.ResponseWriter, r *http.Request, queryid string, pa
 
 	basequery.Del("perpkg")
 	basequery.Del("q")
+	// Ensure the filterurl has at least one parameter, so that we can
+	// always concatenate with the & sign.
+	basequery.Set("_", "_")
 	baseurl.RawQuery = basequery.Encode()
 	filterurl := baseurl.String()
 
@@ -328,6 +331,9 @@ func Search(w http.ResponseWriter, r *http.Request) {
 
 	basequery.Del("perpkg")
 	basequery.Del("q")
+	// Ensure the filterurl has at least one parameter, so that we can
+	// always concatenate with the & sign.
+	basequery.Set("_", "_")
 	baseurl.RawQuery = basequery.Encode()
 	filterurl := baseurl.String()
 

diff --git a/cmd/dcs-web/templates/perpackage-results.html b/cmd/dcs-web/templates/perpackage-results.html
@@ -92,7 +92,7 @@ <h2>Search Results by package for "{{.q}}"</h2>
 <p>
 <strong>Filter by package:</strong>
 {{range $index, $package := .packages}}
-<a href="{{$.filterurl}}?q={{$.q}}+package:{{$package}}">{{$package}}</a>,
+<a href="{{$.filterurl}}&q={{$.q}}+package:{{$package}}">{{$package}}</a>,
 {{end}}
 </p>
 

diff --git a/cmd/dcs-web/templates/results.html b/cmd/dcs-web/templates/results.html
@@ -95,7 +95,7 @@ <h2>Search Results for "{{.q}}"</h2>
 <p>
 <strong>Filter by package:</strong>
 {{range $index, $package := .packages}}
-<a href="{{$.filterurl}}?q={{$.q}}+package:{{$package}}">{{$package}}</a>,
+<a href="{{$.filterurl}}&q={{$.q}}+package:{{$package}}">{{$package}}</a>,
 {{end}}
 </p>