coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bad merge and rebase

Browse Source
This commit is contained in:
Jori Lallo
2017-06-27 00:19:15 -07:00
parent e73eec4486
commit f8a715dcef
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/scenes/Collection/CollectionStore.js
View File

@ -18,7 +18,7 @@ class CollectionStore {
invariant(res && res.data, 'Data should be available'); invariant(res && res.data, 'Data should be available');
const { data } = res; const { data } = res;
if (data.type === 'atlas') this.redirectUrl = data.recentDocuments[0].url; if (data.type === 'atlas') this.redirectUrl = data.documents[0].url;
else throw new Error('TODO code up non-atlas collections'); else throw new Error('TODO code up non-atlas collections');
} catch (e) { } catch (e) {
console.log(e); console.log(e);

8
frontend/scenes/Document/Document.js
View File

@ -137,14 +137,6 @@ type Props = {
</CenteredContent> </CenteredContent>
: this.store.document && : this.store.document &&
<DocumentContainer> <DocumentContainer>
{!isEditing &&
<PublishingInfo
collaborators={this.store.document.collaborators}
createdAt={this.store.document.createdAt}
createdBy={this.store.document.createdBy}
updatedAt={this.store.document.updatedAt}
updatedBy={this.store.document.updatedBy}
/>}
<Editor <Editor
key={this.store.document.id} key={this.store.document.id}
text={this.store.document.text} text={this.store.document.text}

2
server/presenters/collection.js
View File

@ -16,7 +16,7 @@ async function present(ctx, collection, includeRecentDocuments = false) {
}; };
if (collection.type === 'atlas') if (collection.type === 'atlas')
data.navigationTree = collection.navigationTree; data.documents = await collection.getDocumentsStructure();
if (includeRecentDocuments) { if (includeRecentDocuments) {
const documents = await Document.findAll({ const documents = await Document.findAll({