Stopgap sort order + cleanup

This commit is contained in:
Matthew Dillon 2015-06-17 16:24:10 -08:00
parent 30f8e89c40
commit 84cf7817bb
5 changed files with 14 additions and 11 deletions

View file

@ -1,5 +1,6 @@
import DS from 'ember-data';
import config from '../config/environment';
import Ember from 'ember';
export default DS.Model.extend({
speciesName : DS.attr('string'),
@ -14,4 +15,8 @@ export default DS.Model.extend({
createdBy : DS.attr('number'),
updatedBy : DS.attr('number'),
deletedBy : DS.attr('number'),
speciesNameMU: function() {
return Ember.String.htmlSafe(`<em>${this.get('speciesName')}</em>`);
}.property('speciesName').readOnly(),
});

View file

@ -20,13 +20,9 @@ export default DS.Model.extend({
strainNameMU: function() {
let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
return `${this.get('strainName')}${type}`;
return Ember.String.htmlSafe(`${this.get('strainName')}${type}`);
}.property('strainName', 'typeStrain').readOnly(),
fullName: function() {
return `${this.get('species.speciesName')} (strain ${this.get('strainName')})`;
}.property('species', 'strainName').readOnly(),
fullNameMU: function() {
return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainNameMU')}`);
}.property('species', 'strainNameMU').readOnly(),