Clean up beforeModel(s)

Fixes #20
This commit is contained in:
Matthew Dillon 2015-10-14 13:12:06 -07:00
parent 0dbcd45c4e
commit bcd2bbb4c4
10 changed files with 70 additions and 12 deletions

View file

@ -5,8 +5,11 @@ export default Ember.Route.extend({
this._super(transition);
let user_id = transition.params['protected.users.changepassword'].user_id;
if (this.get('session.currentUser.id') !== user_id) {
this.transitionTo('protected.users.index');
}
this.get('session.currentUser').then((user) => {
if (user.get('id') !== user_id) {
this.transitionTo('protected.users.index');
}
});
}
});

View file

@ -1,6 +1,18 @@
import Ember from 'ember';
export default Ember.Route.extend({
beforeModel: function(transition) {
this._super(transition);
let user_id = transition.params['protected.users.edit'].user_id;
this.get('session.currentUser').then((user) => {
if (user.get('id') !== user_id || user.get('isAdmin')) {
this.transitionTo('protected.users.index');
}
});
},
model: function(params) {
return this.store.findRecord('user', params.user_id, { reload: true });
},