From 62e651b597f97a098485469124cc23daae250896 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 13 Nov 2015 14:31:29 -0700
Subject: [PATCH] #55, species

---
 app/models/species.js                                    | 5 -----
 app/models/strain.js                                     | 2 +-
 app/pods/protected/strains/show/strain-card/template.hbs | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/models/species.js b/app/models/species.js
index 7581d10..6e4ac05 100644
--- a/app/models/species.js
+++ b/app/models/species.js
@@ -17,9 +17,4 @@ export default Model.extend({
   updatedBy   : attr('number'),
   sortOrder   : attr('number'),
   canEdit     : attr('boolean'),
-
-  // TODO: move this to component/helper
-  speciesNameMU: function() {
-    return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`);
-  }.property('speciesName').readOnly(),
 });
diff --git a/app/models/strain.js b/app/models/strain.js
index 277e260..ef5e41c 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -31,6 +31,6 @@ export default Model.extend({
   // TODO: move this to component/helper
   // Can't move until Select2 refactor
   fullNameMU: function() {
-    return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`);
+    return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
   }.property('species', 'strainNameMU').readOnly(),
 });
diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs
index 546d7c5..517256d 100644
--- a/app/pods/protected/strains/show/strain-card/template.hbs
+++ b/app/pods/protected/strains/show/strain-card/template.hbs
@@ -10,7 +10,7 @@
         <dt>Species</dt>
         <dd>
           {{#link-to 'protected.species.show' strain.species.id}}
-            <em>{{strain.species.speciesNameMU}}</em>
+            <em>{{strain.species.speciesName}}</em>
           {{/link-to}}
         </dd>
       </dl>