parent
b8e4ba3c84
commit
c561e0ec76
1 changed files with 4 additions and 6 deletions
|
@ -2,7 +2,7 @@ import DS from 'ember-data';
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
|
|
||||||
const { Model, hasMany, belongsTo, attr } = DS;
|
const { Model, hasMany, belongsTo, attr } = DS;
|
||||||
const { computed } = Ember;
|
const { computed, String: { htmlSafe } } = Ember;
|
||||||
|
|
||||||
export default Model.extend({
|
export default Model.extend({
|
||||||
measurements : hasMany('measurements', { async: false }),
|
measurements : hasMany('measurements', { async: false }),
|
||||||
|
@ -28,9 +28,7 @@ export default Model.extend({
|
||||||
return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
|
return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;
|
||||||
}),
|
}),
|
||||||
|
|
||||||
// TODO: move this to component/helper
|
fullNameMU: computed('species', 'strainName', function() {
|
||||||
// Can't move until Select2 refactor
|
return htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
|
||||||
fullNameMU: function() {
|
}),
|
||||||
return Ember.String.htmlSafe(`<em>${this.get('species.speciesName')}</em> ${this.get('strainName')}`);
|
|
||||||
}.property('species', 'strainNameMU').readOnly(),
|
|
||||||
});
|
});
|
||||||
|
|
Reference in a new issue