mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-19 15:51:16 +02:00
Code Issues Releases Wiki Activity

Push user route history in a more appropriate place

Browse Source
This commit is contained in:
Toby Zerner
2015-03-27 11:52:46 +10:30
parent 48d84edff6
commit fe9889fbda
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/ember/app/routes/user.js
View File

@@ -1,6 +1,10 @@
import Ember from 'ember'; 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) { model: function(params) {
return this.store.find('user', params.username); return this.store.find('user', params.username);
}, },

6
framework/core/ember/app/routes/user/activity.js
View File

@@ -1,10 +1,6 @@
import Ember from 'ember'; import Ember from 'ember';
import PushesHistory from 'flarum/mixins/pushes-history'; export default Ember.Route.extend({
export default Ember.Route.extend(PushesHistory, {
historyKey: 'user',
model: function() { model: function() {
return Ember.RSVP.resolve(Ember.ArrayProxy.create()); return Ember.RSVP.resolve(Ember.ArrayProxy.create());
}, },