thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update account service references

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
app/pods/protected/users/show/controller.js
View file

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

4
app/pods/protected/users/show/route.js
View file

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