From 963b3591a4c47530013971e0893030bc196fadef Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 7 Jul 2015 14:47:06 -0800
Subject: [PATCH] characteristics sort order

---
 app/pods/characteristics/controller.js | 2 +-
 app/pods/characteristics/template.hbs  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/pods/characteristics/controller.js b/app/pods/characteristics/controller.js
index ae686a9..88d2200 100644
--- a/app/pods/characteristics/controller.js
+++ b/app/pods/characteristics/controller.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  sortParams: ['characteristicType.characteristicTypeName', 'characteristicName'],
+  sortParams: ['characteristicType.characteristicTypeName', 'sortOrder'],
   sortedCharacteristics: Ember.computed.sort('characteristics', 'sortParams'),
 });
diff --git a/app/pods/characteristics/template.hbs b/app/pods/characteristics/template.hbs
index 63f40a4..cc21bab 100644
--- a/app/pods/characteristics/template.hbs
+++ b/app/pods/characteristics/template.hbs
@@ -6,6 +6,7 @@
     <tr>
       <th>Name</th>
       <th>Type</th>
+      <th>Sort Order</th>
     </tr>
   </thead>
   <tbody>
@@ -13,6 +14,7 @@
       <tr>
         <td>{{row.characteristicName}}</td>
         <td>{{row.characteristicType.characteristicTypeName}}</td>
+        <td>{{row.sortOrder}}</td>
       </tr>
     {{/each}}
   </tbody>