github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't transition to when viewing a user. Just render it.

Browse Source
This commit is contained in:
Robin Ward 2013-07-17 18:13:43 -04:00
parent 3761ccb018
commit a97c093434
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/controllers/user_activity_controller.js
View File

@ -27,8 +27,22 @@ Object.keys(Discourse.UserAction.TYPES).forEach(function (userAction) {
}); });
Discourse.UserIndexRoute = Discourse.Route.extend({ Discourse.UserIndexRoute = Discourse.Route.extend({
redirect: function() { renderTemplate: function() {
this.transitionTo('userActivity.index'); this.render('user_activity', {into: 'user', outlet: 'userOutlet' });
},
model: function() {
var user = this.modelFor('user');
return user.findStream();
},
setupController: function(controller, stream) {
var userActivity = this.controllerFor('userActivity');
userActivity.setProperties({
stream: stream,
model: this.modelFor('user')
});
} }
}); });