From ce94ae4896e91d20cf5249005d7b41ad23047949 Mon Sep 17 00:00:00 2001 From: Ruairi Fahy Date: Tue, 14 Mar 2017 18:30:18 +0000 Subject: [PATCH] Add support for Portia to use newer ember-data --- portiaui/app/services/dispatcher.js | 2 +- portiaui/app/services/store.js | 2 +- portiaui/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/portiaui/app/services/dispatcher.js b/portiaui/app/services/dispatcher.js index 8948d0ab5..31c2e6c55 100644 --- a/portiaui/app/services/dispatcher.js +++ b/portiaui/app/services/dispatcher.js @@ -349,7 +349,7 @@ export default Ember.Service.extend({ const newId = json.data.id; // Update internal store with internal model - const recordMap = store.typeMapFor(internalModel.type).idToRecord; + const recordMap = store._recordMapFor(internalModel.type.modelName).idToRecord; delete recordMap[internalModel.id]; recordMap[newId] = internalModel; diff --git a/portiaui/app/services/store.js b/portiaui/app/services/store.js index d5d8efbc1..cb7b28cbe 100644 --- a/portiaui/app/services/store.js +++ b/portiaui/app/services/store.js @@ -4,7 +4,7 @@ export default DS.Store.extend({ didSaveRecord(internalModel, dataArg) { // update record id if data has different id // TODO: support rollback of id change - const recordMap = this.typeMapFor(internalModel.type).idToRecord; + const recordMap = this._recordMapFor(internalModel.type.modelName).idToRecord; if (internalModel.id !== null && !(internalModel.id in recordMap)) { for (let id of Object.keys(recordMap)) { if (recordMap[id] === internalModel) { diff --git a/portiaui/package.json b/portiaui/package.json index 80d0d67cd..637c3c135 100644 --- a/portiaui/package.json +++ b/portiaui/package.json @@ -44,7 +44,7 @@ "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", "ember-concurrency": "0.7.10", - "ember-data": "~2.11.3", + "ember-data": "^2.12.0", "ember-data-url-templates": "0.1.1", "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1",