Merge branch 'master' into clostridium

* master:
  Easiest to just unload the entire store
  Hide measurements on new strain
  Fix char/strain sort order

app/mixins/delete-model.js

@@ -8,6 +8,7 @@ export default Mixin.create({
   actions: {
     delete: function() {
       this.get('model').destroyRecord().then(() => {
+        this.get('store').unloadAll();
         this.transitionToRoute(this.get('transitionRoute'));
       });
     },

app/pods/protected/characteristics/show/measurements-table/template.hbs

@@ -7,7 +7,7 @@
 <table class="flakes-table">
   <thead>
     <tr>
-      <th {{action "changeSortParam" "strain.strainName"}} class="click">Strain</th>
+      <th {{action "changeSortParam" "strain.sortOrder"}} class="click">Strain</th>
       <th {{action "changeSortParam" "value"}} class="click">Value</th>
       <th {{action "changeSortParam" "notes"}} class="click">Notes</th>
     </tr>

app/pods/protected/strains/strain-form/template.hbs

@@ -53,6 +53,11 @@
       </div>
     </div>
   </fieldset>
+  {{#if isNew}}
+    <div>
+      Please save before adding measurements
+    </div>
+  {{else}}
     <div>
       {{
         protected/strains/measurements-table
@@ -65,6 +70,7 @@
         canAdd=metaData.canAdd
       }}
     </div>
+  {{/if}}
   <br>
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel