From e1f8fbdc322f33f0df55cb8ef5180ece8b28478a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 30 May 2015 13:58:21 +0930 Subject: [PATCH] Prevent error when trying to get relationship and no links have been loaded --- js/lib/model.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/js/lib/model.js b/js/lib/model.js index 88217b9df..156bafc9c 100644 --- a/js/lib/model.js +++ b/js/lib/model.js @@ -80,23 +80,29 @@ export default class Model { static prop(name, transform) { return function() { var data = this.data()[name]; - return transform ? transform(data) : data + return transform ? transform(data) : data; } } static one(name) { return function() { - var link = this.data().links[name]; - return link && app.store.getById(link.linkage.type, link.linkage.id) + var data = this.data(); + if (data.links) { + var link = data.links[name]; + return link && app.store.getById(link.linkage.type, link.linkage.id); + } } } static many(name) { return function() { - var link = this.data().links[name]; - return link && link.linkage.map(function(link) { - return app.store.getById(link.type, link.id) - }) + var data = this.data(); + if (data.links) { + var link = this.data().links[name]; + return link && link.linkage.map(function(link) { + return app.store.getById(link.type, link.id) + }); + } } }