From fa2fe776dee9c4e813be32e8924a612ae5552c39 Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Sun, 4 Nov 2018 12:58:16 +0900
Subject: [PATCH] Revert some of the changes in #2112 (fix #2118)

---
 packages/vulcan-core/lib/modules/default_resolvers.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js
index bdd2aad56..586c5c148 100644
--- a/packages/vulcan-core/lib/modules/default_resolvers.js
+++ b/packages/vulcan-core/lib/modules/default_resolvers.js
@@ -110,17 +110,14 @@ export function getDefaultResolvers(options) {
 
         // use Dataloader if doc is selected by documentId/_id
         const documentId = selector.documentId || selector._id;
-        // documentId can be undefined, this is NOT a failure case
-        // for example it allows form to have a "edit" and "new" mode withtout
-        // needing to swap the withSingle hoc
-        if (!documentId) return { result: null };
+        const doc = documentId
+          ? await collection.loader.load(documentId)
+          : await Connectors.get(collection, selector);
 
-        const doc = await collection.loader.load(documentId);
         if (!doc) {
           if (allowNull) {
             return { result: null };
           } else {
-            // if documentId is provided but no document is found, this is usually a failure case
             const MissingDocumentError = createError('app.missing_document', { message: 'app.missing_document' });
             throw new MissingDocumentError({ data: { documentId, selector } });
           }