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

Support /group/xyz paths as well as /groups/xyz

Browse Source
This commit is contained in:
Robin Ward
2014-10-14 15:10:51 -04:00
parent 366d7e892c
commit 216f718607
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/url.js
View File

@@ -129,7 +129,6 @@ Discourse.URL = Em.Object.createWithMixins({
path = path.replace(rootURL, '');
}
// Rewrite /my/* urls
if (path.indexOf('/my/') === 0) {
var currentUser = Discourse.User.current();
@@ -141,6 +140,11 @@ Discourse.URL = Em.Object.createWithMixins({
}
}
// Rewrite /groups paths
if (path.indexOf('/group/') === 0) {
path = path.replace('group/', 'groups/');
}
if (this.navigatedToPost(oldPath, path)) { return; }
// Schedule a DOM cleanup event
Em.run.scheduleOnce('afterRender', Discourse.Route, 'cleanDOM');

8
app/assets/javascripts/discourse/routes/build-topic-route.js.es6
View File

@@ -41,9 +41,11 @@ export default function(filter, extras) {
setupController: function(controller, model, trans) {
controller.setProperties(Em.getProperties(trans, _.keys(queryParams).map(function(v){
return 'queryParams.' + v;
})));
if (trans) {
controller.setProperties(Em.getProperties(trans, _.keys(queryParams).map(function(v){
return 'queryParams.' + v;
})));
}
var periods = this.controllerFor('discovery').get('periods'),