From d3355370fd05577df7015655f8f102c37a183aa4 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Fri, 16 Oct 2015 11:07:09 -0700
Subject: [PATCH] Linting

---
 app/initializers/custom-session.js                    | 2 --
 app/pods/protected/characteristics/show/controller.js | 2 +-
 app/pods/protected/users/edit/route.js                | 2 +-
 app/pods/protected/users/show/route.js                | 2 +-
 app/pods/protected/users/user-form/component.js       | 4 ----
 app/pods/protected/users/user-form/template.hbs       | 2 +-
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/initializers/custom-session.js b/app/initializers/custom-session.js
index 08d48b8..011cd90 100644
--- a/app/initializers/custom-session.js
+++ b/app/initializers/custom-session.js
@@ -1,5 +1,3 @@
-import Ember from 'ember';
-
 export function initialize(container, application) {
   application.inject('session:custom', '_store', 'service:store');
 }
diff --git a/app/pods/protected/characteristics/show/controller.js b/app/pods/protected/characteristics/show/controller.js
index cc45d06..2ed7872 100644
--- a/app/pods/protected/characteristics/show/controller.js
+++ b/app/pods/protected/characteristics/show/controller.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   actions: {
     delete: function() {
-      this.get('model').destroyRecord()
+      this.get('model').destroyRecord();
       this.transitionToRoute('protected.characteristics.index');
     },
   },
diff --git a/app/pods/protected/users/edit/route.js b/app/pods/protected/users/edit/route.js
index e11116f..3a943b8 100644
--- a/app/pods/protected/users/edit/route.js
+++ b/app/pods/protected/users/edit/route.js
@@ -7,7 +7,7 @@ export default Ember.Route.extend({
     let user_id = transition.params['protected.users.edit'].user_id;
 
     this.get('session.currentUser').then((user) => {
-      if (user.get('id') !== user_id || user.get('isAdmin')) {
+      if (user.get('id') !== user_id && !user.get('isAdmin')) {
         this.transitionTo('protected.users.index');
       }
     });
diff --git a/app/pods/protected/users/show/route.js b/app/pods/protected/users/show/route.js
index e812128..33eeba7 100644
--- a/app/pods/protected/users/show/route.js
+++ b/app/pods/protected/users/show/route.js
@@ -9,7 +9,7 @@ export default Ember.Route.extend({
       if (!currentUser.get('isAdmin') && currentUser.get('id') !== user_id) {
         this.transitionTo('protected.users.index');
       }
-    })
+    });
   },
 
   model: function(params) {
diff --git a/app/pods/protected/users/user-form/component.js b/app/pods/protected/users/user-form/component.js
index d5ce463..0a706f3 100644
--- a/app/pods/protected/users/user-form/component.js
+++ b/app/pods/protected/users/user-form/component.js
@@ -1,10 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  isAdmin: Ember.computed('currentUser', function() {
-    return this.get('currentUser.role') == 'A';
-  }),
-
   roles: Ember.String.w('A R W'),
 
   actions: {
diff --git a/app/pods/protected/users/user-form/template.hbs b/app/pods/protected/users/user-form/template.hbs
index a872aae..c6209a9 100644
--- a/app/pods/protected/users/user-form/template.hbs
+++ b/app/pods/protected/users/user-form/template.hbs
@@ -16,7 +16,7 @@
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Role</label>
-        {{#if isAdmin}}
+        {{#if session.currentUser.isAdmin}}
           <select onchange={{action (mut user.role) value="target.value"}}>
             {{#each roles as |roleChoice|}}
               <option value={{roleChoice}} selected={{equal user.role roleChoice}}>{{roleChoice}}</option>