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:
  Stopgap sort order + cleanup
This commit is contained in:
Matthew Dillon 2015-06-17 16:24:23 -08:00
commit 236a622505
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/pods/compare/controller.js
View file

@ -16,7 +16,7 @@ export default Ember.Controller.extend({
selectedStrains.forEach((strain) => {
let s = this.store.getById('strain', strain);
strains.pushObject(s);
})
});
this.set('strains', strains);
this.store.find('measurement', {

8
app/pods/components/measurement-search-panel/component.js
View file

@ -11,9 +11,10 @@ export default Ember.Component.extend({
characteristics: this.store.findAll('characteristic'),
}).then((models) => {
// Set up search parameters
// Clean up sort order
let selects = [
{ model: 'species', id: 'id', text: 'speciesName',
children: 'strains', cid: 'id', ctext: 'fullName' },
{ model: 'species', id: 'id', text: 'speciesNameMU',
children: 'strains', cid: 'id', ctext: 'strainNameMU' },
{ model: 'characteristicTypes', id: 'id', text: 'characteristicTypeName',
children: 'characteristics', cid: 'id', ctext: 'characteristicName' },
];
@ -25,7 +26,8 @@ export default Ember.Component.extend({
models[item.model] = models[item.model].sortBy(item.text);
let temp = models[item.model].map((data) => {
let temp_children = [];
data.get(item.children).forEach((child) => {
let sorted_children = data.get(item.children).sortBy(item.ctext);
sorted_children.forEach((child) => {
temp_children.push({id: child.get(item.cid), text: child.get(item.ctext)});
});
return {

4
app/pods/strains/index/route.js
View file

@ -7,12 +7,12 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
},
setupController: function(controller, model) {
var tableAttrs = [
{ name: 'Name', attr: 'fullName' },
{ name: 'Name', attr: 'fullNameMU' },
{ name: 'Total Measurements', attr: 'totalMeasurements' }
];
controller.set('model', model);
controller.set('tableAttrs', tableAttrs);
controller.set('row', 'strain-index-row');
controller.set('sort', ['fullName']);
controller.set('sort', ['fullNameMU']);
},
});