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: handle permalinks with query parameters (#12700)

Browse Source
This commit is contained in:
Régis Hanol 2021-04-14 20:03:25 +02:00 committed by GitHub
parent 6a7a8f32f1
commit c1fc2a1e9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/app/routes/unknown.js
View File

@ -3,8 +3,9 @@ import DiscourseURL from "discourse/lib/url";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
export default DiscourseRoute.extend({ export default DiscourseRoute.extend({
model(params, transition) { model(_, transition) {
const path = params.path; const path = transition.intent.url;
return ajax("/permalink-check.json", { return ajax("/permalink-check.json", {
data: { path }, data: { path },
}).then((results) => { }).then((results) => {

6
app/assets/javascripts/discourse/tests/acceptance/unknown-test.js
View File

@ -26,8 +26,8 @@ acceptance("Category 404", function (needs) {
acceptance("Unknown", function (needs) { acceptance("Unknown", function (needs) {
const urls = { const urls = {
"viewtopic.php": "/t/internationalization-localization/280", "/viewtopic.php?f=8&t=280": "/t/internationalization-localization/280",
"not-the-url-for-faq": "/faq", "/another-url-for-faq": "/faq",
}; };
needs.pretender((server, helper) => { needs.pretender((server, helper) => {
@ -59,7 +59,7 @@ acceptance("Unknown", function (needs) {
}); });
test("Permalink URL to a static page", async function (assert) { test("Permalink URL to a static page", async function (assert) {
await visit("/not-the-url-for-faq"); await visit("/another-url-for-faq");
assert.equal(currentURL(), "/faq"); assert.equal(currentURL(), "/faq");
}); });
}); });