github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 08:09:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Stop category 404s from breaking the router (#11424)

Browse Source 
The propagated promise failure from model() caused the router to reject future route transitions, even though it correctly routed to the last-resort 404 page.

Co-authored-by: Jeff Wong <awole20@gmail.com>
This commit is contained in:
Kane York 2020-12-07 14:22:39 -08:00 committed by GitHub
parent d5ba854c91
commit e16b3da04a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/discourse/app/routes/build-category-route.js
View File

@ -66,12 +66,17 @@ export default (filterArg, params) => {
parts.pop();
}
return Category.reloadBySlugPath(parts.join("/")).then((result) => {
const record = this.store.createRecord("category", result.category);
record.setupGroupsAndPermissions();
this.site.updateCategory(record);
return { category: record, modelParams };
});
return Category.reloadBySlugPath(parts.join("/"))
.then((result) => {
const record = this.store.createRecord("category", result.category);
record.setupGroupsAndPermissions();
this.site.updateCategory(record);
return { category: record, modelParams };
})
.catch(() => {
// afterModel will call replaceWith(/404)
return null;
});
}
if (category) {

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

@ -1,7 +1,29 @@
import { acceptance, exists } from "discourse/tests/helpers/qunit-helpers";
import { currentURL, visit } from "@ember/test-helpers";
import { click, currentURL, visit } from "@ember/test-helpers";
import { test } from "qunit";
acceptance("Category 404", function (needs) {
needs.pretender((server, helper) => {
server.get("/c/category-does-not-exist/find_by_slug.json", () => {
return helper.response(404, {
errors: ["The requested URL or resource could not be found."],
error_type: "not_found",
extras: { html: "<div class='page-not-found'>not found</div>" },
});
});
});
test("Navigating to a bad category link does not break the router", async function (assert) {
await visit("/t/internationalization-localization/280");
await click('[data-for-test="category-404"]');
assert.equal(currentURL(), "/404");
// See that we can navigate away
await click("#site-logo");
assert.equal(currentURL(), "/");
});
});
acceptance("Unknown", function (needs) {
const urls = {
"viewtopic.php": "/t/internationalization-localization/280",

2
app/assets/javascripts/discourse/tests/fixtures/topic.js vendored
View File

@ -374,7 +374,7 @@ export default {
uploaded_avatar_id: 40181,
created_at: "2013-02-05T21:32:47.649Z",
cooked:
'<p>The application strings <a href="https://github.com/discourse/discourse/blob/master/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p>',
'<p>The application strings <a href="https://github.com/discourse/discourse/blob/master/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p><p>Link for unknown-test: <a href="/c/category-does-not-exist/99999" data-for-test="category-404">link</a></p>',
post_number: 2,
post_type: 1,
updated_at: "2013-02-06T10:15:27.965Z",