fixing config

app/pods/protected/characteristics/edit/controller.js

@@ -13,8 +13,9 @@ export default Ember.Controller.extend({
           ajaxError(characteristic.get('errors'), this.get('flashMessages'));
         });
       } else {
-        characteristic.deleteRecord();
-        this.transitionToRoute('protected.characteristics.show', characteristic);
+        characteristic.deleteRecord().then(() => {
+          this.transitionToRoute('protected.characteristics.show', characteristic);
+        });
       }
     },
 

app/pods/protected/characteristics/edit/route.js

@@ -1,10 +1,11 @@
 import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('isReader')) {
         this.transitionTo('protected.characteristics.index');
       }

app/pods/protected/characteristics/index/route.js

@@ -1,13 +1,17 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   model: function() {
     return this.store.findAll('characteristic');
   },
 
   setupController: function(controller, model) {
     controller.set('model', model);
-    controller.set('metaData', this.store.metadataFor('characteristic'));
+    this.get('currentUser.account').then((user) => {
+      controller.set('metaData', user.get('metaData'));
+    });
   },
 
 });

app/pods/protected/characteristics/new/route.js

@@ -1,9 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('isReader')) {
         this.transitionTo('protected.characteristics.index');
       }

app/pods/protected/characteristics/show/controller.js

@@ -3,8 +3,9 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   actions: {
     delete: function() {
-      this.get('model').destroyRecord();
-      this.transitionToRoute('protected.characteristics.index');
+      this.get('model').destroyRecord().then(() => {
+        this.transitionToRoute('protected.characteristics.index');
+      });
     },
   },
 

app/pods/protected/compare/results/route.js

@@ -2,6 +2,8 @@ import Ember from 'ember';
 import ajaxRequest from '../../../../utils/ajax-request';
 
 export default Ember.Route.extend({
+  session: Ember.inject.service('session'),
+
   queryParams: {
     strain_ids: {
       refreshModel: true,
@@ -33,7 +35,7 @@ export default Ember.Route.extend({
       method: 'GET',
       data: params,
     };
-    return ajaxRequest(url, options);
+    return ajaxRequest(url, options, this.get('session'));
   },
 
   setupController: function(controller, model) {

app/pods/protected/route.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
   actions: {

app/pods/protected/species/edit/route.js

@@ -1,9 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('isReader')) {
         this.transitionTo('protected.species.index');
       }
@@ -18,7 +20,9 @@ export default Ember.Route.extend({
 
   setupController: function(controller, model) {
     controller.set('model', model);
-    controller.set('metaData', this.store.metadataFor('species'));
+    this.get('currentUser.account').then((user) => {
+      controller.set('metaData', user.get('metaData'));
+    });
   },
 
 });

app/pods/protected/species/index/route.js

@@ -1,13 +1,17 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   model: function() {
     return this.store.findAll('species');
   },
 
   setupController: function(controller, model) {
     controller.set('model', model);
-    controller.set('metaData', this.store.metadataFor('species'));
+    this.get('currentUser.account').then((user) => {
+      controller.set('metaData', user.get('metaData'));
+    });
   },
 
 });

app/pods/protected/species/new/controller.js

@@ -13,8 +13,9 @@ export default Ember.Controller.extend({
           ajaxError(species.get('errors'), this.get('flashMessages'));
         });
       } else {
-        species.deleteRecord();
-        this.transitionToRoute('protected.species.index');
+        species.deleteRecord().then(() => {
+          this.transitionToRoute('protected.species.index');
+        });
       }
     },
 

app/pods/protected/species/new/route.js

@@ -1,9 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('isReader')) {
         this.transitionTo('protected.species.index');
       }

app/pods/protected/species/show/controller.js

@@ -3,8 +3,9 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   actions: {
     delete: function() {
-      this.get('model').destroyRecord();
-      this.transitionToRoute('protected.species.index');
+      this.get('model').destroyRecord().then(() => {
+        this.transitionToRoute('protected.species.index');
+      });
     },
   },
 

app/pods/protected/strains/edit/controller.js

@@ -13,8 +13,9 @@ export default Ember.Controller.extend({
           ajaxError(strain.get('errors'), this.get('flashMessages'));
         });
       } else {
-        strain.deleteRecord();
-        this.transitionToRoute('protected.strains.show', strain);
+        strain.deleteRecord().then(() => {
+          this.transitionToRoute('protected.strains.show', strain);
+        });
       }
     },
 

app/pods/protected/strains/edit/route.js

@@ -1,10 +1,11 @@
 import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('isReader')) {
         this.transitionTo('protected.strains.index');
       }
@@ -26,7 +27,9 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
   setupController: function(controller, models) {
     controller.setProperties(models);
-    controller.set('metaData', this.store.metadataFor('strain'));
+    this.get('currentUser.account').then((user) => {
+      controller.set('metaData', user.get('metaData'));
+    });
   },
 
 });

app/pods/protected/strains/index/route.js

@@ -1,13 +1,17 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   model: function() {
     return this.store.findAll('strain');
   },
 
   setupController: function(controller, model) {
     controller.set('model', model);
-    controller.set('metaData', this.store.metadataFor('strain'));
+    this.get('currentUser.account').then((user) => {
+      controller.set('metaData', user.get('metaData'));
+    });
   },
 
 });

app/pods/protected/strains/new/route.js

@@ -1,9 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('isReader')) {
         this.transitionTo('protected.strains.index');
       }

app/pods/protected/strains/show/controller.js

@@ -3,8 +3,9 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   actions: {
     delete: function() {
-      this.get('model').destroyRecord();
-      this.transitionToRoute('protected.strains.index');
+      this.get('model').destroyRecord().then(() => {
+        this.transitionToRoute('protected.strains.index');
+      });
     },
   },
 

app/pods/protected/strains/show/route.js

@@ -1,7 +1,6 @@
 import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Ember.Route.extend({
   model: function(params) {
     return this.store.findRecord('strain', params.strain_id, { reload: true });
   },

app/pods/protected/users/changepassword/controller.js

@@ -2,6 +2,9 @@ import Ember from 'ember';
 import ajaxRequest from '../../../../utils/ajax-request';
 
 export default Ember.Controller.extend({
+  session: Ember.inject.service('session'),
+  currentUser: Ember.inject.service('session-account'),
+
   passwordConfirm: null,
 
   actions: {
@@ -16,11 +19,11 @@ 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'),
         },
       };
-      ajaxRequest(url, options);
+      ajaxRequest(url, options, this.get('session'));
       this.transitionTo('protected.users.index');
       this.get('flashMessages').information('Your password has been changed.');
     },

app/pods/protected/users/changepassword/route.js

@@ -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');
       }

app/pods/protected/users/edit/route.js

@@ -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.edit'].user_id;
 
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (user.get('id') !== user_id && !user.get('isAdmin')) {
         this.transitionTo('protected.users.index');
       }

app/pods/protected/users/edit/template.hbs

@@ -1,7 +1,7 @@
 {{
   protected/users/user-form
   user=model
-  currentUser=session.currentUser
+  currentUser=currentUser.account
   save="save"
   cancel="cancel"
 }}

app/pods/protected/users/index/route.js

@@ -1,9 +1,11 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
-    this.get('session.currentUser').then((user) => {
+    this.get('currentUser.account').then((user) => {
       if (!user.get('isAdmin')) {
         this.transitionTo('protected.index');
       }

app/pods/protected/users/show/controller.js

@@ -1,7 +1,9 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  isUser: Ember.computed('model.id', 'session.currentUser.id', function() {
-    return this.get('model.id') === this.get('session.currentUser.id');
+  currentUser: Ember.inject.service('session-account'),
+
+  isUser: Ember.computed('model.id', 'currentUser.account.id', function() {
+    return this.get('model.id') === this.get('currentUser.account.id');
   }),
 });

app/pods/protected/users/show/route.js

@@ -1,10 +1,12 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  currentUser: Ember.inject.service('session-account'),
+
   beforeModel: function(transition) {
     this._super(transition);
 
-    this.get('session.currentUser').then((currentUser) => {
+    this.get('currentUser.account').then((currentUser) => {
       let user_id = transition.params['protected.users.show'].user_id;
       if (!currentUser.get('isAdmin') && currentUser.get('id') !== user_id) {
         this.transitionTo('protected.users.index');