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

Merge branch 'master' into clostridium

Browse source 
* master:
  Compare - link to chars
This commit is contained in:
Matthew Dillon 2015-11-17 13:47:39 -07:00
commit ab964bbca1
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/pods/protected/compare/results/results-table/template.hbs
View file

@ -14,8 +14,16 @@
<tbody> <tbody>
{{#each characteristics as |row|}} {{#each characteristics as |row|}}
<tr> <tr>
{{#each row key="@index" as |col|}} {{#each row key="@index" as |col index|}}
<td>{{col}}</td> <td>
{{#unless index}}
{{#link-to 'protected.characteristics.show' col.id}}
{{col.characteristicName}}
{{/link-to}}
{{else}}
{{col}}
{{/unless}}
</td>
{{/each}} {{/each}}
</tr> </tr>
{{/each}} {{/each}}

3
app/pods/protected/compare/results/route.js
View file

@ -38,8 +38,7 @@ export default Route.extend({
setupController: function(controller, model) { setupController: function(controller, model) {
model.forEach((m, i) => { model.forEach((m, i) => {
const c = this.store.peekRecord('characteristic', m[0]); model[i][0] = this.store.peekRecord('characteristic', m[0]);
model[i][0] = c.get('characteristicName');
}); });
const compare = this.controllerFor('protected.compare'); const compare = this.controllerFor('protected.compare');