Merge pull request #1301 from ugent-library/fix_issue_1299

fix issue 1299: cap page to last page when out of range
ugent-library · Nov 6, 2023 · 72edfda · 72edfda
2 parents f0287de + b800941
commit 72edfda
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/handlers/datasetsearching/search.go b/handlers/datasetsearching/search.go
@@ -89,6 +89,15 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request, ctx Context) {
 		isFirstUse = globalHits.Total == 0
 	}
 
+	// you are on the wrong page: cap page to last available page
+	if hits.Total > 0 && len(hits.Hits) == 0 {
+		query := ctx.CurrentURL.Query()
+		query.Set("page", fmt.Sprintf("%d", hits.TotalPages()))
+		ctx.CurrentURL.RawQuery = query.Encode()
+		http.Redirect(w, r, ctx.CurrentURL.String(), http.StatusTemporaryRedirect)
+		return
+	}
+
 	render.Layout(w, "layouts/default", "dataset/pages/search", YieldSearch{
 		Context:      ctx,
 		PageTitle:    "Overview - Datasets - Biblio",
@@ -150,6 +159,15 @@ func (h *Handler) CurationSearch(w http.ResponseWriter, r *http.Request, ctx Con
 		isFirstUse = globalHits.Total == 0
 	}
 
+	// you are on the wrong page: cap page to last available page
+	if hits.Total > 0 && len(hits.Hits) == 0 {
+		query := ctx.CurrentURL.Query()
+		query.Set("page", fmt.Sprintf("%d", hits.TotalPages()))
+		ctx.CurrentURL.RawQuery = query.Encode()
+		http.Redirect(w, r, ctx.CurrentURL.String(), http.StatusTemporaryRedirect)
+		return
+	}
+
 	render.Layout(w, "layouts/default", "dataset/pages/search", YieldSearch{
 		Context:      ctx,
 		PageTitle:    "Overview - Datasets - Biblio",

diff --git a/handlers/publicationsearching/search.go b/handlers/publicationsearching/search.go
@@ -90,6 +90,15 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request, ctx Context) {
 		isFirstUse = globalHits.Total == 0
 	}
 
+	// you are on the wrong page: cap page to last available page
+	if hits.Total > 0 && len(hits.Hits) == 0 {
+		query := ctx.CurrentURL.Query()
+		query.Set("page", fmt.Sprintf("%d", hits.TotalPages()))
+		ctx.CurrentURL.RawQuery = query.Encode()
+		http.Redirect(w, r, ctx.CurrentURL.String(), http.StatusTemporaryRedirect)
+		return
+	}
+
 	render.Layout(w, "layouts/default", "publication/pages/search", YieldSearch{
 		Context:      ctx,
 		PageTitle:    "Overview - Publications - Biblio",
@@ -151,6 +160,15 @@ func (h *Handler) CurationSearch(w http.ResponseWriter, r *http.Request, ctx Con
 		isFirstUse = globalHits.Total == 0
 	}
 
+	// you are on the wrong page: cap page to last available page
+	if hits.Total > 0 && len(hits.Hits) == 0 {
+		query := ctx.CurrentURL.Query()
+		query.Set("page", fmt.Sprintf("%d", hits.TotalPages()))
+		ctx.CurrentURL.RawQuery = query.Encode()
+		http.Redirect(w, r, ctx.CurrentURL.String(), http.StatusTemporaryRedirect)
+		return
+	}
+
 	render.Layout(w, "layouts/default", "publication/pages/search", YieldSearch{
 		Context:      ctx,
 		PageTitle:    "Overview - Publications - Biblio",