diff --git a/ember/app/routes/user.js b/ember/app/routes/user.js index 77c199a0e..863324357 100644 --- a/ember/app/routes/user.js +++ b/ember/app/routes/user.js @@ -1,6 +1,10 @@ import Ember from 'ember'; -export default Ember.Route.extend({ +import PushesHistory from 'flarum/mixins/pushes-history'; + +export default Ember.Route.extend(PushesHistory, { + historyKey: 'user', + model: function(params) { return this.store.find('user', params.username); }, diff --git a/ember/app/routes/user/activity.js b/ember/app/routes/user/activity.js index 1b5c437de..bec0726c5 100644 --- a/ember/app/routes/user/activity.js +++ b/ember/app/routes/user/activity.js @@ -1,10 +1,6 @@ import Ember from 'ember'; -import PushesHistory from 'flarum/mixins/pushes-history'; - -export default Ember.Route.extend(PushesHistory, { - historyKey: 'user', - +export default Ember.Route.extend({ model: function() { return Ember.RSVP.resolve(Ember.ArrayProxy.create()); },