Merge branch 'master' into share-links

2018-05-22 21:27:45 -07:00
parent 187c2dcb27 05339441e7
commit b40b77b228
9 changed files with 76 additions and 42 deletions
--- a/server/api/documents.js
+++ b/server/api/documents.js
@ -428,7 +428,7 @@ router.post('documents.delete', auth(), async ctx => {
  authorize(ctx.state.user, 'delete', document);

  const collection = document.collection;
-  if (collection.type === 'atlas') {
+  if (collection && collection.type === 'atlas') {
    // Delete document and all of its children
    await collection.removeDocument(document);
  }