From 377105eedd89b30fcb8170ac3aaa64d40b85c7d8 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Fri, 22 Sep 2023 14:08:05 +0200 Subject: [PATCH 1/5] Keep filter when showing unfiltered results on explore page --- templates/explore/repo_search.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index e684d2a1c4aba..a189a37c5e10d 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -36,7 +36,7 @@ {{if and .PageIsExploreRepositories .OnlyShowRelevant}}
- {{.locale.Tr "explore.relevant_repositories" ((print $.Link "?only_show_relevant=0")|Escape) | Safe}} + {{.locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType $.Keyword $.Language)|Escape) | Safe}}
{{end}}
From b7f9c722561ca134013118c698876f09a587f9ca Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 10 Oct 2023 15:50:57 +0200 Subject: [PATCH 2/5] Escape Parameter --- templates/explore/repo_search.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index a189a37c5e10d..47ef7e3f6d5a9 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -34,9 +34,9 @@ -{{if and .PageIsExploreRepositories .OnlyShowRelevant}} +{{if and .PageIsExploreRepositories}}
- {{.locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType $.Keyword $.Language)|Escape) | Safe}} + {{.locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType (QueryEscape $.Keyword) $.Language)|Escape) | Safe}}
{{end}}
From 59ca52b36a1c6c6c88fd25a32ef0ec4b4e32f3d5 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 10 Oct 2023 15:51:44 +0200 Subject: [PATCH 3/5] Remove testcode --- templates/explore/repo_search.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index 47ef7e3f6d5a9..9ac7bf8fd34af 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -34,7 +34,7 @@ -{{if and .PageIsExploreRepositories}} +{{if and .PageIsExploreRepositories .OnlyShowRelevant}}
{{.locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType (QueryEscape $.Keyword) $.Language)|Escape) | Safe}}
From af856206ef813c1a240afd336a78efff92a78e14 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Tue, 10 Oct 2023 16:07:07 +0200 Subject: [PATCH 4/5] Fix locale.Tr --- templates/explore/repo_search.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index eed70528509a0..3e05eb674c0d3 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -36,7 +36,7 @@ {{if and .PageIsExploreRepositories .OnlyShowRelevant}}
- {{ctx.Locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType (QueryEscape $.Keyword) $.Language)|Escape) | Safe}} + {{ctx.Locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType (QueryEscape $.Keyword) $.Language)|Escape) | Safe}}
{{end}}
From 0c6b3fa383bed0c8213a257d21a4969e1eb088ab Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 11 Oct 2023 15:34:43 +0200 Subject: [PATCH 5/5] Update templates/explore/repo_search.tmpl Co-authored-by: wxiaoguang --- templates/explore/repo_search.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index 3e05eb674c0d3..31b00d29e3920 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -36,7 +36,7 @@ {{if and .PageIsExploreRepositories .OnlyShowRelevant}}
- {{ctx.Locale.Tr "explore.relevant_repositories" ((printf "%s?only_show_relevant=0&sort=%s&q=%s&language=%s" $.Link $.SortType (QueryEscape $.Keyword) $.Language)|Escape) | Safe}} + {{ctx.Locale.Tr "explore.relevant_repositories" ((printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))|Escape) | Safe}}
{{end}}