Update account service references

This commit is contained in:
Matthew Ryan Dillon 2015-10-20 15:04:35 -07:00
parent 52979ac9e2
commit bbcef5459e
18 changed files with 56 additions and 25 deletions

View file

@ -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,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
setupController: function(controller, models) {
controller.setProperties(models);
this.get('session.currentUser').then((user) => {
this.get('currentUser.account').then((user) => {
controller.set('metaData', user.get('metaData'));
});
},

View file

@ -1,13 +1,15 @@
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);
this.get('session.currentUser').then((user) => {
this.get('currentUser.account').then((user) => {
controller.set('metaData', user.get('metaData'));
});
},

View file

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