Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: delegation error when reloading user activity

This commit is contained in:
Robin Ward 2014-08-08 09:44:21 -04:00
parent 4f60eb6c77
commit d7f28baf77
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/routes/user-activity.js.es6
View File

@ -4,6 +4,7 @@ export default Discourse.Route.extend({
}, },
setupController: function(controller, user) { setupController: function(controller, user) {
this.controllerFor('user-activity').set('model', user);
this.controllerFor('user').set('pmView', null); this.controllerFor('user').set('pmView', null);
// Bring up a draft // Bring up a draft

6
app/assets/javascripts/discourse/routes/user_topic_list_routes.js
View File

@ -5,11 +5,7 @@ Discourse.UserTopicListRoute = Discourse.Route.extend({
setupController: function(controller, model) { setupController: function(controller, model) {
this.controllerFor('user').set('indexStream', false); this.controllerFor('user').set('indexStream', false);
try { this.controllerFor('user-activity').set('userActionType', this.get('userActionType'));
this.controllerFor('user_activity').set('userActionType', this.get('userActionType'));
} catch (e){
/* ROBIN FIX ME: fails on reload of PM */
}
this.controllerFor('user_topics_list').setProperties({ this.controllerFor('user_topics_list').setProperties({
model: model, model: model,
hideCategory: false, hideCategory: false,