Merge master

2017-09-13 19:18:49 -07:00
parent 72b10787e5 85fc377566
commit 00d18ceda3
27 changed files with 581 additions and 144 deletions
--- a/frontend/components/Layout/components/SidebarCollection/SidebarCollection.js
+++ b/frontend/components/Layout/components/SidebarCollection/SidebarCollection.js
@ -43,7 +43,7 @@ const activeStyle = {
          {!canDropToImport &&
            <SidebarLink to={doc.url}>{doc.title}</SidebarLink>}

-          {(document.pathToDocument.includes(doc.id) ||
+          {(document.pathToDocument.map(entry => entry.id).includes(doc.id) ||
            document.id === doc.id) &&
            <Children column>
              {doc.children && this.renderDocuments(doc.children, depth + 1)}