Merge branch 'master' into inputs

2017-06-27 21:53:11 -07:00
parent dcb5017d71 0057d305b8
commit ab43e2af54
16 changed files with 237 additions and 136 deletions
--- a/frontend/components/Layout/Layout.js
+++ b/frontend/components/Layout/Layout.js
@ -59,7 +59,7 @@ type Props = {
  };

  render() {
-    const { user, auth, ui, collections } = this.props;
+    const { user, auth, ui } = this.props;

    return (
      <Container column auto>
@ -112,7 +112,8 @@ type Props = {
                <LinkSection>
                  {ui.activeCollection
                    ? <SidebarCollection
-                        collection={collections.getById(ui.activeCollection)}
+                        document={ui.activeDocument}
+                        collection={ui.activeCollection}
                      />
                    : <SidebarCollectionList />}
                </LinkSection>