bad merge and rebase

2017-06-27 00:19:15 -07:00
parent e73eec4486
commit f8a715dcef
3 changed files with 2 additions and 10 deletions
--- a/server/presenters/collection.js
+++ b/server/presenters/collection.js
@@ -16,7 +16,7 @@ async function present(ctx, collection, includeRecentDocuments = false) {
  };

  if (collection.type === 'atlas')
-    data.navigationTree = collection.navigationTree;
+    data.documents = await collection.getDocumentsStructure();

  if (includeRecentDocuments) {
    const documents = await Document.findAll({