auto-reload compare/results model, cleanup
This commit is contained in:
		
							parent
							
								
									8bdc31f99e
								
							
						
					
					
						commit
						cd082ef616
					
				
					 4 changed files with 22 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -8,7 +8,7 @@ export default Ember.Controller.extend({
 | 
			
		|||
    let strain_ids = this.get('strain_ids').split(',');
 | 
			
		||||
    strain_ids.forEach((id) => {
 | 
			
		||||
      strains.push(this.store.peekRecord('strain', id));
 | 
			
		||||
    })
 | 
			
		||||
    });
 | 
			
		||||
    return strains;
 | 
			
		||||
  }.property('strain_ids'),
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -17,7 +17,7 @@ export default Ember.Controller.extend({
 | 
			
		|||
    let characteristic_ids = this.get('characteristic_ids').split(',');
 | 
			
		||||
    characteristic_ids.forEach((id) => {
 | 
			
		||||
      characteristics.push(this.store.peekRecord('characteristic', id));
 | 
			
		||||
    })
 | 
			
		||||
    });
 | 
			
		||||
    return characteristics;
 | 
			
		||||
  }.property('characteristic_ids'),
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -45,6 +45,6 @@ export default Ember.Controller.extend({
 | 
			
		|||
      data.pushObject(row);
 | 
			
		||||
    });
 | 
			
		||||
    return data;
 | 
			
		||||
  }.property('characteristics', 'strains'),
 | 
			
		||||
  }.property('characteristics', 'strains').readOnly(),
 | 
			
		||||
 | 
			
		||||
});
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,22 @@
 | 
			
		|||
import Ember from 'ember';
 | 
			
		||||
 | 
			
		||||
export default Ember.Route.extend({
 | 
			
		||||
  queryParams: {
 | 
			
		||||
    strain_ids: {
 | 
			
		||||
      refreshModel: true,
 | 
			
		||||
    },
 | 
			
		||||
    characteristic_ids: {
 | 
			
		||||
      refreshModel: true,
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  beforeModel: function(transition) {
 | 
			
		||||
    this._super(transition);
 | 
			
		||||
    if (Ember.$.isEmptyObject(transition.queryParams)) {
 | 
			
		||||
      this.transitionTo('protected.compare');
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  model: function(params) {
 | 
			
		||||
    let compare = this.controllerFor('protected.compare');
 | 
			
		||||
    compare.set('selectedStrains', params.strain_ids);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue