Merge pull request #1383 from internets/1370

Fix deprecations from deprecation-workflow
HospitalRun · Mar 22, 2018 · 89bd15d · 89bd15d
2 parents 4c2db5c + 2140450
commit 89bd15d
Show file tree

Hide file tree

Showing 9 changed files with 640 additions and 910 deletions.
diff --git a/app/components/date-input.js b/app/components/date-input.js
@@ -53,6 +53,6 @@ export default EmInput.extend(PikadayComponent, {
     let displayPropertyName = `display_${dateProperty}`;
     this.currentDate = Ember.computed.alias(`model.${dateProperty}`);
     this.addObserver(`model.${dateProperty}`, this, this.currentDateChangedValue);
-    Ember.Binding.from(`model.errors.${dateProperty}`).to(`model.errors.${displayPropertyName}`).connect(this);
+    Ember.defineProperty(this, `model.errors.${displayPropertyName}`, Ember.computed.alias(`model.errors.${dateProperty}`));
   }
 });
diff --git a/app/components/inventory-location-picker.js b/app/components/inventory-location-picker.js
@@ -45,7 +45,7 @@ export default Ember.Component.extend({
   },
 
   _setup: function() {
-    Ember.Binding.from('selectedLocations').to('componentSelectedLocations').connect(this);
+    Ember.defineProperty(this, 'componentSelectedLocations', Ember.computed.alias('selectedLocations'));
   }.on('init'),
 
   _setupLocationPickers(locationPickers, locationList, setInitialLocation) {
@@ -83,7 +83,7 @@ export default Ember.Component.extend({
       return (previousValue + location.get('quantity'));
     }, 0);
     this._setupLocationPickers(locationPickers, locationList, true);
-    this.locationChange();
+    Ember.run.scheduleOnce('afterRender', this, this.locationChange);
     this.set('doingSetup', false);
     return this.get('calculatedLocationPickers');
   }.property('calculatedLocationPickers', 'locationList', 'quantityRequested')

diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -2,8 +2,6 @@ window.deprecationWorkflow = window.deprecationWorkflow || {};
 window.deprecationWorkflow.config = {
   workflow: [
     { handler: 'silence', matchId: 'ember-getowner-polyfill.import' },
-    { handler: 'silence', matchId: 'ember-metal.binding' },
     { handler: 'silence', matchId: 'ember-views.did-init-attrs' },
-    { handler: 'silence', matchId: 'ds.serializer.private-should-serialize-has-many' }
   ]
 };