Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-22 14:49:42 +02:00
Code Releases Activity

Fix up post-Enterprise Edition merge

Browse source
This commit is contained in:
McMatts 2018-12-23 16:06:15 +00:00
parent 6f495dd1c6
commit eb56169fe5
4 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/app/components/document/settings-general.js
View file

@ -32,7 +32,7 @@ export default Component.extend(Notifier, {
if (this.get('hasNameError')) return; if (this.get('hasNameError')) return;
if (!this.get('permissions.documentEdit')) return; if (!this.get('permissions.documentEdit')) return;
this.set('document.name', this.get('docName')); this.set('document.name', this.get('docName').trim());
this.set('document.excerpt', this.get('docExcerpt').trim()); this.set('document.excerpt', this.get('docExcerpt').trim());
let cb = this.get('onSaveDocument'); let cb = this.get('onSaveDocument');

8
gui/app/components/folder/settings-general.js
View file

@ -62,14 +62,6 @@ export default Component.extend(AuthMixin, Notifier, {
this.set('spaceType', t); this.set('spaceType', t);
}, },
// onSetLikes(l) {
// this.set('allowLikes', l);
// schedule('afterRender', () => {
// if (l) this.$('#space-likes-prompt').focus();
// });
// },
onSave() { onSave() {
if (!this.get('isSpaceAdmin')) return; if (!this.get('isSpaceAdmin')) return;

1
gui/app/pods/document/index/template.hbs
View file

@ -96,4 +96,3 @@
onPageLevelChange=(action "onPageLevelChange") onPageLevelChange=(action "onPageLevelChange")
onPageSequenceChange=(action "onPageSequenceChange")}} onPageSequenceChange=(action "onPageSequenceChange")}}
{{/layout/master-content}} {{/layout/master-content}}

6
gui/app/templates/components/document/document-page.hbs
View file

@ -1,7 +1,5 @@
<div id="page-{{page.id}}" data-id={{page.id}} data-type={{page.contentType}}> <div id="page-{{page.id}}" data-id={{page.id}} data-type={{page.contentType}}>
{{#if editMode}} {{#if editMode}}
<div class="wysiwyg"> <div class="wysiwyg">
{{document/document-editor {{document/document-editor
document=document document=document
@ -11,9 +9,7 @@
onCancel=(action "onCancelEdit") onCancel=(action "onCancelEdit")
onAction=(action "onSavePage")}} onAction=(action "onSavePage")}}
</div> </div>
{{else}} {{else}}
{{document/page-heading {{document/page-heading
page=page page=page
meta=meta meta=meta
@ -37,7 +33,5 @@
<div class="wysiwyg"> <div class="wysiwyg">
{{section/base-renderer page=page}} {{section/base-renderer page=page}}
</div> </div>
{{/if}} {{/if}}
</div> </div>