From d7f28baf7762cfca9b208d907cd4ffd2f5d36785 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 8 Aug 2014 09:44:21 -0400 Subject: [PATCH] FIX: delegation error when reloading user activity --- .../javascripts/discourse/routes/user-activity.js.es6 | 1 + .../javascripts/discourse/routes/user_topic_list_routes.js | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js.es6 index 7974035666..be81d64573 100644 --- a/app/assets/javascripts/discourse/routes/user-activity.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-activity.js.es6 @@ -4,6 +4,7 @@ export default Discourse.Route.extend({ }, setupController: function(controller, user) { + this.controllerFor('user-activity').set('model', user); this.controllerFor('user').set('pmView', null); // Bring up a draft diff --git a/app/assets/javascripts/discourse/routes/user_topic_list_routes.js b/app/assets/javascripts/discourse/routes/user_topic_list_routes.js index 3c80a0855e..12bb0acdb5 100644 --- a/app/assets/javascripts/discourse/routes/user_topic_list_routes.js +++ b/app/assets/javascripts/discourse/routes/user_topic_list_routes.js @@ -5,11 +5,7 @@ Discourse.UserTopicListRoute = Discourse.Route.extend({ setupController: function(controller, model) { this.controllerFor('user').set('indexStream', false); - try { - this.controllerFor('user_activity').set('userActionType', this.get('userActionType')); - } catch (e){ - /* ROBIN FIX ME: fails on reload of PM */ - } + this.controllerFor('user-activity').set('userActionType', this.get('userActionType')); this.controllerFor('user_topics_list').setProperties({ model: model, hideCategory: false,