diff --git a/.jshintrc b/.jshintrc index 08096ef..32bd9c7 100644 --- a/.jshintrc +++ b/.jshintrc @@ -2,7 +2,8 @@ "predef": [ "document", "window", - "-Promise" + "-Promise", + "FlakesFrame" ], "browser": true, "boss": true, diff --git a/app/pods/protected/compare/results/controller.js b/app/pods/protected/compare/results/controller.js index 24fd5e7..c8fafc1 100644 --- a/app/pods/protected/compare/results/controller.js +++ b/app/pods/protected/compare/results/controller.js @@ -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(), }); diff --git a/app/pods/protected/compare/results/route.js b/app/pods/protected/compare/results/route.js index 757d14d..ef097f3 100644 --- a/app/pods/protected/compare/results/route.js +++ b/app/pods/protected/compare/results/route.js @@ -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); diff --git a/app/pods/protected/compare/route.js b/app/pods/protected/compare/route.js index e8a8576..19c8e94 100644 --- a/app/pods/protected/compare/route.js +++ b/app/pods/protected/compare/route.js @@ -5,7 +5,7 @@ export default Ember.Route.extend({ return this.store.findAll('characteristic'); }, - setupController: function(controller, model) { + setupController: function(controller/*, model*/) { controller.set('characteristics', this.store.peekAll('characteristic')); controller.set('strains', this.store.peekAll('strain')); },