From a7c9f0112590f68c385247446c8b71e6b20e4d51 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Mon, 7 May 2018 17:59:43 -0600 Subject: [PATCH] fixed bug --- graph/resolvers/asset.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js index ae5188e6e..3ed5305b7 100644 --- a/graph/resolvers/asset.js +++ b/graph/resolvers/asset.js @@ -72,9 +72,9 @@ const Asset = { // if we have some. let globalSettings = await Settings.select(...fields); if (settings !== null) { - settings = Object.assign({}, globalSettings.toObject(), settings); + settings = Object.assign({}, globalSettings, settings); } else { - settings = globalSettings.toObject(); + settings = globalSettings; } return settings;