From 5be2888223c0c34b11d9b77b6863d1a94668d16d Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Sun, 4 Oct 2015 15:54:02 -0700
Subject: [PATCH] minor cleanup
---
app/models/user.js | 1 +
app/pods/application/adapter.js | 1 -
app/pods/protected/strains/show/measurements-table/component.js | 2 +-
app/pods/protected/users/show/template.hbs | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/models/user.js b/app/models/user.js
index bb7c5fd..680a9f4 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -5,6 +5,7 @@ export default DS.Model.extend({
password : DS.attr('string'),
name : DS.attr('string'),
role : DS.attr('string'),
+ canEdit : DS.attr('boolean'),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
deletedAt: DS.attr('date'),
diff --git a/app/pods/application/adapter.js b/app/pods/application/adapter.js
index 184060e..11498d0 100644
--- a/app/pods/application/adapter.js
+++ b/app/pods/application/adapter.js
@@ -1,5 +1,4 @@
import DS from 'ember-data';
-import Ember from 'ember';
export default DS.RESTAdapter.extend({
namespace: function() {
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
index 3fe5de5..8d8e31d 100644
--- a/app/pods/protected/strains/show/measurements-table/component.js
+++ b/app/pods/protected/strains/show/measurements-table/component.js
@@ -18,7 +18,7 @@ export default Ember.Component.extend({
addCharacteristic: function() {
const c = this.store.createRecord('characteristic', {
sortOrder: -999
- })
+ });
const m = this.store.createRecord('measurement', {
characteristic: c
});
diff --git a/app/pods/protected/users/show/template.hbs b/app/pods/protected/users/show/template.hbs
index 32117c9..4f7fca9 100644
--- a/app/pods/protected/users/show/template.hbs
+++ b/app/pods/protected/users/show/template.hbs
@@ -43,7 +43,7 @@
{{/link-to}}
{{#if model.canEdit}}
<br>
- {{#link-to 'protected.user.edit' model.id class="button-gray smaller"}}
+ {{#link-to 'protected.users.edit' model.id class="button-gray smaller"}}
Edit
{{/link-to}}
{{/if}}