From 516569e2e96ead7dbf000eff1d8abc9d17a6ad56 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 28 Jul 2015 18:28:31 +0930
Subject: [PATCH] Ensure the correct relationship values are returned

---
 framework/core/js/lib/Model.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/framework/core/js/lib/Model.js b/framework/core/js/lib/Model.js
index 736083545..55362861b 100644
--- a/framework/core/js/lib/Model.js
+++ b/framework/core/js/lib/Model.js
@@ -225,7 +225,9 @@ export default class Model {
       if (this.data.relationships) {
         const relationship = this.data.relationships[name];
 
-        return relationship && app.store.getById(relationship.data.type, relationship.data.id);
+        if (relationship) {
+          return app.store.getById(relationship.data.type, relationship.data.id);
+        }
       }
 
       return false;
@@ -247,7 +249,9 @@ export default class Model {
       if (this.data.relationships) {
         const relationship = this.data.relationships[name];
 
-        return relationship && relationship.data.map(data => app.store.getById(data.type, data.id));
+        if (relationship) {
+          return relationship.data.map(data => app.store.getById(data.type, data.id));
+        }
       }
 
       return false;