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

FIX: Handling of /p/### URLs within Ember (#15536)

Browse Source
This commit is contained in:
David Taylor 2022-01-11 13:10:46 +00:00 committed by GitHub
parent b3e52f99e6
commit 8eb61de1cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/discourse/app/routes/post.js
View File

@ -1,17 +1,14 @@
import DiscourseRoute from "discourse/routes/discourse";
import { ajax } from "discourse/lib/ajax";
import { inject as service } from "@ember/service";
export default DiscourseRoute.extend({
beforeModel({ params, _discourse_anchor }) {
return ajax(`/p/${params.post.id}`).then((t) => {
const transition = this.transitionTo(
"topic.fromParamsNear",
t.slug,
t.id,
t.current_post_number
);
router: service(),
transition._discourse_anchor = _discourse_anchor;
});
model(params) {
return this.store.find("post", params.id);
},
afterModel(post) {
this.router.transitionTo(post.url);
},
});

7
app/assets/javascripts/discourse/tests/acceptance/topic-test.js
View File

@ -588,6 +588,7 @@ acceptance("Navigating between topics", function (needs) {
firstPost.cooked += `\n<a class='same-topic-slugless-post' href='/t/280/3'>Link 2</a>`;
firstPost.cooked += `\n<a class='diff-topic-slugless' href='/t/281'>Link 3</a>`;
firstPost.cooked += `\n<a class='diff-topic-slugless-post' href='/t/281/3'>Link 3</a>`;
firstPost.cooked += `\n<a class='by-post-id' href='/p/${firstPost.id}'>Link to Post</a>`;
server.get("/t/280.json", () => helper.response(topicResponse));
server.get("/t/280/:post_number.json", () =>
@ -617,4 +618,10 @@ acceptance("Navigating between topics", function (needs) {
await click("a.diff-topic-slugless-post");
assert.ok(currentURL().includes("/281"));
});
test("clicking post URLs", async function (assert) {
await visit("/t/-/280");
await click("a.by-post-id");
assert.ok(currentURL().includes("/280"));
});
});