Refactoring strains

app/pods/strains/show/controller.js

@@ -1,19 +1,14 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  isEditing: false,
-  actions: {
-    save: function() {
-      var strain = this.get('strain');
-      if (strain.get('isDirty')) {
-        strain.save();
-      }
-      this.toggleProperty('isEditing');
-    },
-    cancel: function() {
-      this.get('strain').get('errors').clear();
-      this.get('strain').rollback();
-      this.toggleProperty('isEditing');
+  userCanEdit: function() {
+    let meta = this.store.metadataFor('strain');
+    let id = this.get('model.id');
+
+    if (meta.canEdit.indexOf( +id ) === -1) {
+      return false;
     }
-  }
+    return true;
+  }.property('model.isLoaded').readOnly(),
+
 });

app/pods/strains/show/route.js

@@ -3,12 +3,6 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
   model: function(params) {
-    return Ember.RSVP.hash({
-      strain: this.store.find('strain', params.strain_id),
-      species: this.store.findAll('species')
-    });
-  },
-  setupController: function(controller, models) {
-    controller.setProperties(models);
-  },
+    return this.store.find('strain', params.strain_id);
+  }
 });

app/pods/strains/show/template.hbs

@@ -1,8 +1,90 @@
-{{
-  strain-details
-  strain=strain
-  species=species
-  isEditing=isEditing
-  save="save"
-  cancel="cancel"
-}}
+<div class="span-1">
+  <fieldset class="flakes-information-box {{if isEditing 'is-editing'}}">
+    <legend>
+      Strain {{model.strainNameMU}}
+    </legend>
+
+    {{! ROW 1 }}
+    <div class="grid-4 gutter-50">
+      <dl class="span-2">
+        <dt>Species</dt>
+        <dd>
+          {{#link-to 'species.show' model.species.id}}
+            <em>{{model.species.speciesNameMU}}</em>
+          {{/link-to}}
+        </dd>
+      </dl>
+      <dl class="span-2">
+        <dt>Type Strain?</dt>
+        <dd>
+          {{if model.typeStrain 'Yes' 'No'}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 2 }}
+    <div class="grid-6">
+      <dl class="span-2">
+        <dt>Accession Numbers</dt>
+        <dd>
+          {{model.accessionNumbers}}
+        </dd>
+      </dl>
+      <dl class="span-2">
+        <dt>Genbank</dt>
+        <dd>
+          {{genbank-url genbank=model.genbank}}
+        </dd>
+      </dl>
+      <dl class="span-2">
+        <dt>Whole Genome Sequence</dt>
+        <dd>
+          {{model.wholeGenomeSequence}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 3 }}
+    <div class="grid-4">
+      <dl class="span-4">
+        <dt>Isolated From</dt>
+        <dd>
+          {{model.isolatedFrom}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 4 }}
+    <div class="grid-4">
+      <dl class="span-4">
+        <dt>Notes</dt>
+        <dd>
+          {{model.notes}}
+        </dd>
+      </dl>
+    </div>
+
+    {{! ROW 5 }}
+    <div class="grid-4">
+      <dl class="span-1">
+        <dt>Record Created</dt>
+        <dd>{{null-time model.createdAt 'LL'}}</dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Record Updated</dt>
+        <dd>{{null-time model.updatedAt 'LL'}}</dd>
+      </dl>
+      <dl class="span-1">
+        <dt>Record Deleted</dt>
+        <dd>{{null-time model.deletedAt 'LL'}}</dd>
+      </dl>
+      <dl class="span-1"></dl>
+    </div>
+  </fieldset>
+</div>
+{{#if userCanEdit}}
+  <br>
+  {{#link-to 'species.edit' model class="button-gray smaller"}}
+    Edit
+  {{/link-to}}
+{{/if}}