github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 04:42:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Handle none path correctly with three levels

Browse Source 
With a path like "/c/foo/1/none", "none" was being interpreted as an id.
This commit is contained in:
Daniel Waterworth 2019-11-29 11:53:05 +00:00
parent 3cf4ba5069
commit c414db107c
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,13 +18,27 @@ export default (filterArg, params) => {
serialize(modelParams) {
if (!modelParams.category_slug_path_with_id) {
modelParams.category_slug_path_with_id = [
modelParams.parentSlug,
modelParams.slug,
modelParams.id
]
.filter(x => x)
.join("/");
if (modelParams.id === "none") {
const category_slug_path_with_id = [
modelParams.parentSlug,
modelParams.slug
].join("/");
const category = Category.findBySlugPathWithID(
category_slug_path_with_id
);
this.replaceWith("discovery.categoryNone", {
category,
category_slug_path_with_id
});
} else {
modelParams.category_slug_path_with_id = [
modelParams.parentSlug,
modelParams.slug,
modelParams.id
]
.filter(x => x)
.join("/");
}
}
return modelParams;