diff --git a/addon/utils/related-proxy.js b/addon/utils/related-proxy.js index 7a9d7fd..7b231ac 100644 --- a/addon/utils/related-proxy.js +++ b/addon/utils/related-proxy.js @@ -62,8 +62,10 @@ const RelatedProxyUtil = Ember.Object.extend({ proxyFactory = Ember.ArrayProxy; newContent = Ember.A([]); } else if (kind === 'toOne') { - proxyFactory = Ember.ObjectProxy; - newContent = Ember.Object.create(); + proxyFactory = Ember.ObjectProxy.extend(Ember.PromiseProxyMixin, { + promise: new Ember.RSVP.Promise(resolve => { resolve(null); }) + }); + newContent = null; } if (resource.get('isNew')) { return proxyFactory.create({ content: newContent }); @@ -92,7 +94,7 @@ const RelatedProxyUtil = Ember.Object.extend({ 'promise': promise, 'type': relation, 'kind': kind }); return proxyProto.create({ - content: (kind === 'toOne') ? Ember.Object.create() : Ember.A([]) + content: (kind === 'toOne') ? null : Ember.A([]) }); },