From 8772ba2f80a9c196c02fefb4899b4da6e7ffe543 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 1 Feb 2016 15:11:44 +0800 Subject: [PATCH] FIX: Redirecting breaks the back button. --- .../pre-initializers/dynamic-route-builders.js.es6 | 1 + .../discourse/routes/discovery-category-with-id.js.es6 | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 index 1bd40078369..57da82cbc91 100644 --- a/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 +++ b/app/assets/javascripts/discourse/pre-initializers/dynamic-route-builders.js.es6 @@ -10,6 +10,7 @@ export default { app.DiscoveryCategoryController = DiscoverySortableController.extend(); app.DiscoveryParentCategoryController = DiscoverySortableController.extend(); app.DiscoveryCategoryNoneController = DiscoverySortableController.extend(); + app.DiscoveryCategoryWithIDController = DiscoverySortableController.extend(); app.DiscoveryCategoryRoute = buildCategoryRoute('latest'); app.DiscoveryParentCategoryRoute = buildCategoryRoute('latest'); diff --git a/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6 b/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6 index c36b4bae792..dcb55b4a6a9 100644 --- a/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6 +++ b/app/assets/javascripts/discourse/routes/discovery-category-with-id.js.es6 @@ -1,11 +1,7 @@ import Category from 'discourse/models/category'; -export default Discourse.Route.extend({ - model: function(params) { - return Category.findById(params.id); - }, - - redirect: function(model) { - this.transitionTo(`/c/${Category.slugFor(model)}`); +export default Discourse.DiscoveryCategoryRoute.extend({ + model(params) { + return { category: Category.findById(params.id) }; } });