From ee6667a64e2cb91b9d4d8fc61e1b3802b7a85d83 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Thu, 22 Jan 2026 10:37:11 +0000 Subject: [PATCH] appview/pages: use queryParams func to build pagination URLs; wrap in safeUrl when constructing a url using url.Values.Encode, we need to avoid escaping the `=` symbol, which is performed by the default urlescaper behavior in href contexts; so we wrap the call with safeUrl. Signed-off-by: oppiliappan --- appview/pages/templates/fragments/pagination.html | 4 ++-- appview/pages/templates/repo/issues/issues.html | 2 +- appview/pages/templates/repo/pulls/pulls.html | 2 +- 3 file(s) changed, 4 insertion(s)(+), 4 deletion(s)(-) diff --git a/appview/pages/templates/fragments/pagination.html b/appview/pages/templates/fragments/pagination.html --- a/appview/pages/templates/fragments/pagination.html +++ b/appview/pages/templates/fragments/pagination.html @@ -1,9 +1,9 @@ {{ define "fragments/pagination" }} - {{/* Params: Page (pagination.Page), TotalCount (int), BasePath (string), QueryParams (string) */}} + {{/* Params: Page (pagination.Page), TotalCount (int), BasePath (string), QueryParams (url.Values) */}} {{ $page := .Page }} {{ $totalCount := .TotalCount }} {{ $basePath := .BasePath }} - {{ $queryParams := .QueryParams }} + {{ $queryParams := safeUrl .QueryParams.Encode }} {{ $prev := $page.Previous.Offset }} {{ $next := $page.Next.Offset }} diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html --- a/appview/pages/templates/repo/issues/issues.html +++ b/appview/pages/templates/repo/issues/issues.html @@ -80,7 +80,7 @@ {{ template "fragments/pagination" (dict "Page" .Page "TotalCount" .IssueCount "BasePath" (printf "/%s/issues" .RepoInfo.FullName) - "QueryParams" (printf "state=%s&q=%s" $state .FilterQuery) + "QueryParams" (queryParams "state" $state "q" .FilterQuery) ) }} {{ end }} {{ end }} diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html --- a/appview/pages/templates/repo/pulls/pulls.html +++ b/appview/pages/templates/repo/pulls/pulls.html @@ -166,7 +166,7 @@ {{ template "fragments/pagination" (dict "Page" .Page "TotalCount" .PullCount "BasePath" (printf "/%s/pulls" .RepoInfo.FullName) - "QueryParams" (printf "state=%s&q=%s" .FilteringBy.String .FilterQuery) + "QueryParams" (queryParams "state" .FilteringBy.String "q" .FilterQuery) ) }} {{ end }} {{ end }} -- tangled.sh