diff --git a/app/pods/protected/about/route.js b/app/pods/protected/about/route.js index 5b14286..096e3c5 100644 --- a/app/pods/protected/about/route.js +++ b/app/pods/protected/about/route.js @@ -1,4 +1,3 @@ import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; -export default Ember.Route.extend(AuthenticatedRouteMixin); +export default Ember.Route.extend({}); diff --git a/app/pods/protected/characteristics/route.js b/app/pods/protected/characteristics/route.js index 77c7739..cf8c61a 100644 --- a/app/pods/protected/characteristics/route.js +++ b/app/pods/protected/characteristics/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() { return this.store.findAll('characteristic'); }, diff --git a/app/pods/protected/index/route.js b/app/pods/protected/index/route.js index 6fc51ce..bfdf329 100644 --- a/app/pods/protected/index/route.js +++ b/app/pods/protected/index/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({ beforeModel: function(transition) { this._super(transition); this.transitionTo('protected.compare'); diff --git a/app/pods/protected/measurements/route.js b/app/pods/protected/measurements/route.js index b3f843f..096e3c5 100644 --- a/app/pods/protected/measurements/route.js +++ b/app/pods/protected/measurements/route.js @@ -1,4 +1,3 @@ import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; -export default Ember.Route.extend(AuthenticatedRouteMixin, {}); +export default Ember.Route.extend({}); diff --git a/app/pods/protected/species/edit/route.js b/app/pods/protected/species/edit/route.js index 6c264c2..59dcc15 100644 --- a/app/pods/protected/species/edit/route.js +++ b/app/pods/protected/species/edit/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({ afterModel: function(species) { if (!species.get('canEdit')) { this.transitionTo('species.show', species.get('id')); diff --git a/app/pods/protected/species/new/route.js b/app/pods/protected/species/new/route.js index 8c9caf9..3d15e44 100644 --- a/app/pods/protected/species/new/route.js +++ b/app/pods/protected/species/new/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({ beforeModel: function(transition) { this._super(transition); if (this.get('session.currentUser.role') === 'R') { diff --git a/app/pods/protected/species/show/route.js b/app/pods/protected/species/show/route.js index da42b03..94f8361 100644 --- a/app/pods/protected/species/show/route.js +++ b/app/pods/protected/species/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('species', params.species_id, { reload: true }); }, diff --git a/app/pods/protected/strains/index/route.js b/app/pods/protected/strains/index/route.js index 9456dfc..9a19a1c 100644 --- a/app/pods/protected/strains/index/route.js +++ b/app/pods/protected/strains/index/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() { return this.store.findAll('strain'); }, diff --git a/app/pods/protected/strains/new/route.js b/app/pods/protected/strains/new/route.js index cb601a3..8c0ee68 100644 --- a/app/pods/protected/strains/new/route.js +++ b/app/pods/protected/strains/new/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({ beforeModel: function(transition) { this._super(transition); if (this.get('session.currentUser.role') === 'R') {