thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

strain.strainNameMU to component

Browse source 
Part of #55
This commit is contained in:
Matthew Dillon 2015-11-13 14:24:26 -07:00
parent 20a6707144
commit 81b6b9aee4
7 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/strain.js
View file

@ -22,12 +22,6 @@ export default Model.extend({
sortOrder : attr('number'), sortOrder : attr('number'),
canEdit : attr('boolean'), canEdit : attr('boolean'),
// TODO: move this to component/helper
strainNameMU: function() {
let type = this.get('typeStrain') ? '<sup>T</sup>' : '';
return Ember.String.htmlSafe(`${this.get('strainName')}${type}`);
}.property('strainName', 'typeStrain').readOnly(),
// TODO: move this to component/helper // TODO: move this to component/helper
fullName: Ember.computed('species', 'strainName', function() { fullName: Ember.computed('species', 'strainName', function() {
return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`; return `${this.get('species.speciesName')} ${this.get('strainNameMU')}`;

1
app/pods/components/strain-name/template.hbs Normal file
View file

@ -0,0 +1 @@
{{strain.strainName}}{{{if strain.typeStrain '<sup>T</sup>' ''}}}

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

@ -17,7 +17,7 @@
<tr> <tr>
<td> <td>
{{#link-to 'protected.strains.show' row.strain.id}} {{#link-to 'protected.strains.show' row.strain.id}}
{{{row.strain.strainNameMU}}} {{strain-name strain=row.strain}}
{{/link-to}} {{/link-to}}
</td> </td>
<td> <td>

2
app/pods/protected/species/index/species-table/template.hbs
View file

@ -23,7 +23,7 @@
{{#each species.strains as |strain index|}} {{#each species.strains as |strain index|}}
{{if index ","}} {{if index ","}}
{{#link-to 'protected.strains.show' strain.id}} {{#link-to 'protected.strains.show' strain.id}}
{{{strain.strainNameMU}}} {{strain-name strain=strain}}
{{/link-to}} {{/link-to}}
{{/each}} {{/each}}
</td> </td>

2
app/pods/protected/species/show/species-card/template.hbs
View file

@ -14,7 +14,7 @@
{{#each species.strains as |strain index|}} {{#each species.strains as |strain index|}}
<li> <li>
{{#link-to 'protected.strains.show' strain.id}} {{#link-to 'protected.strains.show' strain.id}}
{{{strain.strainNameMU}}} {{strain-name strain=strain}}
{{/link-to}} {{/link-to}}
</li> </li>
{{/each}} {{/each}}

2
app/pods/protected/species/species-form/template.hbs
View file

@ -19,7 +19,7 @@
{{#each strains as |strain index|}} {{#each strains as |strain index|}}
{{if index ","}} {{if index ","}}
{{#link-to 'protected.strains.show' strain.id}} {{#link-to 'protected.strains.show' strain.id}}
{{{strain.strainNameMU}}} {{strain-name strain=strain}}
{{/link-to}} {{/link-to}}
{{/each}} {{/each}}
{{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}} {{add-button label="Add Strain" link="protected.strains.new" canAdd=metaData.canAdd}}

2
app/pods/protected/strains/show/strain-card/template.hbs
View file

@ -1,7 +1,7 @@
<div class="span-1"> <div class="span-1">
<fieldset class="flakes-information-box"> <fieldset class="flakes-information-box">
<legend> <legend>
{{strain.strainNameMU}} {{strain-name strain=strain}}
</legend> </legend>
{{! ROW 1 }} {{! ROW 1 }}