From 9b0528e38ffd296c3e2827207e33d50c650bad3f Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Mon, 13 Jul 2015 09:46:18 -0800
Subject: [PATCH] SQUASH with drop chartype

---
 app/pods/protected/characteristics/controller.js | 2 +-
 app/pods/protected/characteristics/template.hbs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/pods/protected/characteristics/controller.js b/app/pods/protected/characteristics/controller.js
index d1d9ed1..be9f042 100644
--- a/app/pods/protected/characteristics/controller.js
+++ b/app/pods/protected/characteristics/controller.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'],
+  sortParams: ['characteristicTypeName', 'sortOrder'],
   sortedCharacteristics: Ember.computed.sort('model', 'sortParams'),
 });
diff --git a/app/pods/protected/characteristics/template.hbs b/app/pods/protected/characteristics/template.hbs
index b9bd848..a599cbd 100644
--- a/app/pods/protected/characteristics/template.hbs
+++ b/app/pods/protected/characteristics/template.hbs
@@ -13,7 +13,7 @@
     {{#each sortedCharacteristics as |row|}}
       <tr>
         <td>{{row.characteristicName}}</td>
-        <td>{{row.characteristicType.characteristicTypeName}}</td>
+        <td>{{row.characteristicTypeName}}</td>
         <td>{{row.sortOrder}}</td>
       </tr>
     {{/each}}