From 1408276609825c4082f625180c28e95bc0a15d67 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 8 Mar 2013 17:04:41 +0100 Subject: [PATCH] Changes for ember-data revision 12 Sideload changed a way of loading records associated with the main record. Now, to make it simple, sideloaded records must be always in plural form. --- assets/scripts/app/models/build.coffee | 1 - assets/scripts/app/models/job.coffee | 1 - assets/scripts/app/store.coffee | 2 +- assets/scripts/app/store/rest_adapter.coffee | 7 +++++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 1f9b9079..47f87d30 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -16,7 +16,6 @@ require 'travis/model' repo: DS.belongsTo('Travis.Repo') commit: DS.belongsTo('Travis.Commit') - commits: DS.belongsTo('Travis.Commit') jobs: DS.hasMany('Travis.Job') config: (-> diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 3e95f0d8..7ccb72b9 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -17,7 +17,6 @@ require 'travis/model' repo: DS.belongsTo('Travis.Repo') build: DS.belongsTo('Travis.Build') commit: DS.belongsTo('Travis.Commit') - commits: DS.belongsTo('Travis.Commit') # this is a fake relationship just to get rid # of ember data's bug: https://github.com/emberjs/data/issues/758 diff --git a/assets/scripts/app/store.coffee b/assets/scripts/app/store.coffee index d9e5ec03..92519e07 100644 --- a/assets/scripts/app/store.coffee +++ b/assets/scripts/app/store.coffee @@ -3,7 +3,7 @@ require 'store/rest_adapter' coerceId = (id) -> if id == null then null else id+'' Travis.Store = DS.Store.extend - revision: 11 + revision: 12 adapter: Travis.RestAdapter.create() init: -> diff --git a/assets/scripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee index 6b2ac960..b240e3d4 100644 --- a/assets/scripts/app/store/rest_adapter.coffee +++ b/assets/scripts/app/store/rest_adapter.coffee @@ -102,6 +102,13 @@ Travis.RestAdapter = DS.RESTAdapter.extend merge: (store, record, serialized) -> @get('serializer').merge(record, serialized) + didFindRecord: (store, type, payload, id) -> + if (type == Travis.Build || type == Travis.Job) && payload.commit? + payload.commits = payload.commit + delete payload.commit + + @_super.apply this, arguments + didSaveRecord: (store, type, record, payload) -> # API sometimes return { result: true } response # which does not play nice with ember-data. For now