From a97c09343464be499f30cf4b030337486a2e8b68 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 17 Jul 2013 18:13:43 -0400
Subject: [PATCH] FIX: Don't transition to when viewing a user. Just render it.

---
 .../controllers/user_activity_controller.js    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/user_activity_controller.js b/app/assets/javascripts/discourse/controllers/user_activity_controller.js
index 53da441cf8..d25f884c8e 100644
--- a/app/assets/javascripts/discourse/controllers/user_activity_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user_activity_controller.js
@@ -27,8 +27,22 @@ Object.keys(Discourse.UserAction.TYPES).forEach(function (userAction) {
 });
 
 Discourse.UserIndexRoute = Discourse.Route.extend({
-  redirect: function() {
-    this.transitionTo('userActivity.index');
+  renderTemplate: function() {
+    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')
+    });
   }
 });