IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Preserve history when routing to /filter route (#29929)

Browse Source
This commit is contained in:
Keegan George 2024-11-27 03:26:25 +09:00 committed by GitHub
parent fd22dd179a
commit 5605bab2c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/app/routes/discovery-filter.js
View File

@ -1,10 +1,11 @@
import { setTopicList } from "discourse/lib/topic-list-tracker"; import { setTopicList } from "discourse/lib/topic-list-tracker";
import { escapeExpression } from "discourse/lib/utilities";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
export default class DiscoveryFilterRoute extends DiscourseRoute { export default class DiscoveryFilterRoute extends DiscourseRoute {
queryParams = { queryParams = {
q: { replace: true, refreshModel: true }, q: { refreshModel: true },
}; };
async model(data) { async model(data) {
@ -19,7 +20,7 @@ export default class DiscoveryFilterRoute extends DiscourseRoute {
} }
titleToken() { titleToken() {
const filterText = i18n("filters.filter.title"); const query = this.paramsFor(this.routeName).q;
return i18n("filters.with_topics", { filter: filterText }); return i18n("filters.filter.title", { filter: escapeExpression(query) });
} }
} }

2
config/locales/client.en.yml
View File

@ -4352,7 +4352,7 @@ en:
with_topics: "%{filter} topics" with_topics: "%{filter} topics"
with_category: "%{filter} %{category} topics" with_category: "%{filter} %{category} topics"
filter: filter:
title: "Filter" title: "Filtered results for %{filter}"
button: button:
label: "Filter" label: "Filter"
latest: latest: