Update account service references
This commit is contained in:
parent
52979ac9e2
commit
bbcef5459e
18 changed files with 56 additions and 25 deletions
|
@ -2,6 +2,8 @@ import Ember from 'ember';
|
|||
import ajaxRequest from '../../../../utils/ajax-request';
|
||||
|
||||
export default Ember.Controller.extend({
|
||||
currentUser: Ember.inject.service('session-account'),
|
||||
|
||||
passwordConfirm: null,
|
||||
|
||||
actions: {
|
||||
|
@ -16,7 +18,7 @@ export default Ember.Controller.extend({
|
|||
let options = {
|
||||
method: 'POST',
|
||||
data: {
|
||||
id: this.get('session.currentUser.id'),
|
||||
id: this.get('currentUser.account.id'),
|
||||
password: this.get('password'),
|
||||
},
|
||||
};
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
import Ember from 'ember';
|
||||
|
||||
export default Ember.Route.extend({
|
||||
currentUser: Ember.inject.service('session-account'),
|
||||
|
||||
beforeModel: function(transition) {
|
||||
this._super(transition);
|
||||
|
||||
let user_id = transition.params['protected.users.changepassword'].user_id;
|
||||
|
||||
this.get('session.currentUser').then((user) => {
|
||||
this.get('currentUser.account').then((user) => {
|
||||
if (user.get('id') !== user_id) {
|
||||
this.transitionTo('protected.users.index');
|
||||
}
|
||||
|
|
Reference in a new issue