parent
e54c6fcb2f
commit
b12ff0eb20
7 changed files with 34 additions and 51 deletions
|
@ -1,10 +1,10 @@
|
|||
import Ember from 'ember';
|
||||
import ajaxRequest from '../../../../utils/ajax-request';
|
||||
|
||||
const { Route, $: { isEmptyObject }, inject: { service } } = Ember;
|
||||
|
||||
export default Route.extend({
|
||||
session: service(),
|
||||
ajax: service(),
|
||||
|
||||
queryParams: {
|
||||
strain_ids: {
|
||||
|
@ -33,12 +33,7 @@ export default Route.extend({
|
|||
compare.set('selectedStrains', params.strain_ids);
|
||||
compare.set('selectedCharacteristics', params.characteristic_ids);
|
||||
|
||||
const url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/compare`;
|
||||
const options = {
|
||||
method: 'GET',
|
||||
data: params,
|
||||
};
|
||||
return ajaxRequest(url, options, this.get('session'));
|
||||
return this.get('ajax').request('/compare', { data: params })
|
||||
},
|
||||
|
||||
setupController: function(controller, model) {
|
||||
|
|
|
@ -1,24 +1,17 @@
|
|||
import Ember from 'ember';
|
||||
import ajaxRequest from '../../../../utils/ajax-request';
|
||||
|
||||
const { Controller, inject: { service } } = Ember;
|
||||
|
||||
export default Controller.extend({
|
||||
session: service(),
|
||||
ajax: service(),
|
||||
currentUser: service('session-account'),
|
||||
|
||||
actions: {
|
||||
save: function(password) {
|
||||
const url = `${this.get('globals.apiURL')}/api/${this.get('globals.genus')}/users/password`;
|
||||
const id = this.get('currentUser.account.id');
|
||||
const options = {
|
||||
method: 'POST',
|
||||
data: {
|
||||
id: id,
|
||||
password: password,
|
||||
},
|
||||
};
|
||||
ajaxRequest(url, options, this.get('session'));
|
||||
const data = { id: id, password: password };
|
||||
this.get('ajax').post('/users/password', { data: data });
|
||||
this.transitionToRoute('protected.users.show', id);
|
||||
this.get('flashMessages').information('Your password has been changed.');
|
||||
},
|
||||
|
|
Reference in a new issue