mirror of
https://github.com/documize/community.git
synced 2025-08-02 20:15:26 +02:00
upgraded Ember and Bootstrap, merged changes
This commit is contained in:
sauls8t
parent
b4fd42da38
commit
5dd7d9c181
114 changed files with 9814 additions and 1361 deletions
|
|
@ -19,8 +19,7 @@ export default Controller.extend(TooltipMixin, {
|
|||
templateService: service('template'),
|
||||
sectionService: service('section'),
|
||||
linkService: service('link'),
|
||||
queryParams: ['pageId', 'tab'],
|
||||
pageId: '',
|
||||
currentPageId: '',
|
||||
tab: 'content',
|
||||
|
||||
actions: {
|
||||
|
|
@ -28,9 +27,13 @@ export default Controller.extend(TooltipMixin, {
|
|||
this.set('tab', tab);
|
||||
},
|
||||
|
||||
onShowPage(pageId) {
|
||||
this.set('tab', 'content');
|
||||
this.get('browser').scrollTo(`#page-${pageId}`);
|
||||
},
|
||||
|
||||
onSaveDocument(doc) {
|
||||
this.get('documentService').save(doc);
|
||||
|
||||
this.get('browser').setTitle(doc.get('name'));
|
||||
this.get('browser').setMetaDescription(doc.get('excerpt'));
|
||||
},
|
||||
|
|
@ -60,19 +63,26 @@ export default Controller.extend(TooltipMixin, {
|
|||
},
|
||||
|
||||
onSavePage(page, meta) {
|
||||
let documentId = this.get('document.id');
|
||||
let document = this.get('document');
|
||||
let documentId = document.get('id');
|
||||
let constants = this.get('constants');
|
||||
|
||||
// if document approval mode is locked return
|
||||
if (document.get('protection') == constants.ProtectionType.Lock) {
|
||||
// should not really happen
|
||||
return;
|
||||
}
|
||||
|
||||
// Go ahead and save edits as normal
|
||||
let model = {
|
||||
page: page.toJSON({ includeId: true }),
|
||||
meta: meta.toJSON({ includeId: true })
|
||||
};
|
||||
|
||||
this.get('documentService').updatePage(documentId, page.get('id'), model).then((up) => {
|
||||
this.set('pageId', up.get('id'));
|
||||
|
||||
this.get('documentService').getPages(this.get('document.id')).then((pages) => {
|
||||
this.get('documentService').updatePage(documentId, page.get('id'), model).then((/*up*/) => {
|
||||
this.get('documentService').fetchPages(documentId, this.get('session.user.id')).then((pages) => {
|
||||
this.set('pages', pages);
|
||||
|
||||
this.get('linkService').getDocumentLinks(this.get('document.id')).then((links) => {
|
||||
this.get('linkService').getDocumentLinks(documentId).then((links) => {
|
||||
this.set('links', links);
|
||||
});
|
||||
});
|
||||
|
|
@ -81,55 +91,38 @@ export default Controller.extend(TooltipMixin, {
|
|||
|
||||
onPageDeleted(deletePage) {
|
||||
let documentId = this.get('document.id');
|
||||
let pages = this.get('pages');
|
||||
let deleteId = deletePage.id;
|
||||
let deleteChildren = deletePage.children;
|
||||
let page = _.findWhere(pages, {
|
||||
id: deleteId
|
||||
});
|
||||
let pageIndex = _.indexOf(pages, page, false);
|
||||
let pendingChanges = [];
|
||||
|
||||
let pages = this.get('pages');
|
||||
let pageIndex = _.findIndex(pages, function(i) { return i.get('page.id') === deleteId; });
|
||||
let item = pages[pageIndex];
|
||||
|
||||
// select affected pages
|
||||
for (var i = pageIndex + 1; i < pages.get('length'); i++) {
|
||||
if (pages[i].get('level') <= page.get('level')) {
|
||||
break;
|
||||
}
|
||||
if (i === pageIndex + 1 && pages[i].get('page.level') === item.get('page.level')) break;
|
||||
if (pages[i].get('page.level') <= item.get('page.level')) break;
|
||||
|
||||
pendingChanges.push({
|
||||
pageId: pages[i].get('id'),
|
||||
level: pages[i].get('level') - 1
|
||||
});
|
||||
pendingChanges.push({ pageId: pages[i].get('page.id'), level: pages[i].get('page.level') - 1 });
|
||||
}
|
||||
|
||||
this.set('pageId', '');
|
||||
|
||||
if (deleteChildren) {
|
||||
// nuke of page tree
|
||||
pendingChanges.push({
|
||||
pageId: deleteId
|
||||
});
|
||||
pendingChanges.push({ pageId: deleteId });
|
||||
|
||||
this.get('documentService').deletePages(documentId, deleteId, pendingChanges).then(() => {
|
||||
// update our models so we don't have to reload from db
|
||||
for (var i = 0; i < pendingChanges.length; i++) {
|
||||
let pageId = pendingChanges[i].pageId;
|
||||
this.set('pages', _.reject(pages, function (p) { //jshint ignore: line
|
||||
return p.get('id') === pageId;
|
||||
}));
|
||||
}
|
||||
|
||||
this.set('pages', _.sortBy(pages, "sequence"));
|
||||
this.get('target._routerMicrolib').refresh();
|
||||
// this.send('onPageLevelChange', '', pendingChanges);
|
||||
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then((pages) => {
|
||||
this.set('pages', pages);
|
||||
});
|
||||
});
|
||||
} else {
|
||||
// page delete followed by re-leveling child pages
|
||||
this.get('documentService').deletePage(documentId, deleteId).then(() => {
|
||||
this.set('pages', _.reject(pages, function (p) {
|
||||
return p.get('id') === deleteId;
|
||||
}));
|
||||
|
||||
this.send('onPageLevelChange', pendingChanges);
|
||||
// this.send('onPageLevelChange', '', pendingChanges);
|
||||
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then((pages) => {
|
||||
this.set('pages', pages);
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
@ -139,10 +132,10 @@ export default Controller.extend(TooltipMixin, {
|
|||
this.get('documentService').addPage(this.get('document.id'), data).then((newPage) => {
|
||||
let data = this.get('store').normalize('page', newPage);
|
||||
this.get('store').push(data);
|
||||
this.set('pageId', newPage.id);
|
||||
|
||||
this.get('documentService').getPages(this.get('document.id')).then((pages) => {
|
||||
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then((pages) => {
|
||||
this.set('pages', pages);
|
||||
this.eventBus.publish('documentPageAdded', newPage.id);
|
||||
|
||||
if (newPage.pageType === 'tab') {
|
||||
this.transitionToRoute('document.section',
|
||||
|
|
@ -185,34 +178,24 @@ export default Controller.extend(TooltipMixin, {
|
|||
this.get('templateService').saveAsTemplate(this.get('document.id'), name, desc).then(function () {});
|
||||
},
|
||||
|
||||
onPageSequenceChange(changes) {
|
||||
onPageSequenceChange(currentPageId, changes) {
|
||||
this.set('currentPageId', currentPageId);
|
||||
this.get('documentService').changePageSequence(this.get('document.id'), changes).then(() => {
|
||||
this.get('documentService').getPages(this.get('document.id')).then( (pages) => {
|
||||
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then( (pages) => {
|
||||
this.set('pages', pages);
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
onPageLevelChange(changes) {
|
||||
onPageLevelChange(currentPageId, changes) {
|
||||
this.set('currentPageId', currentPageId);
|
||||
this.get('documentService').changePageLevel(this.get('document.id'), changes).then(() => {
|
||||
this.get('documentService').getPages(this.get('document.id')).then( (pages) => {
|
||||
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then( (pages) => {
|
||||
this.set('pages', pages);
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
onGotoPage(id) {
|
||||
if (id !== '') {
|
||||
this.set('pageId', id);
|
||||
this.set('tab', 'content');
|
||||
|
||||
let jumpTo = "#page-" + id;
|
||||
if (!$(jumpTo).inView()) {
|
||||
$(jumpTo).velocity("scroll", { duration: 250, offset: -100 });
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
onTagChange(tags) {
|
||||
let doc = this.get('document');
|
||||
doc.set('tags', tags);
|
||||
|
|
@ -224,6 +207,16 @@ export default Controller.extend(TooltipMixin, {
|
|||
this.set('tab', 'content');
|
||||
this.get('target._routerMicrolib').refresh();
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
refresh() {
|
||||
this.get('documentService').fetchPages(this.get('document.id'), this.get('session.user.id')).then((data) => {
|
||||
this.set('pages', data);
|
||||
});
|
||||
|
||||
this.get('sectionService').getSpaceBlocks(this.get('folder.id')).then((data) => {
|
||||
this.set('blocks', data);
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
//
|
||||
// https://documize.com
|
||||
|
||||
import { hash } from 'rsvp';
|
||||
import { Promise as EmberPromise, hash } from 'rsvp';
|
||||
import { inject as service } from '@ember/service';
|
||||
import Route from '@ember/routing/route';
|
||||
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
|
||||
|
|
@ -20,6 +20,15 @@ export default Route.extend(AuthenticatedRouteMixin, {
|
|||
folderService: service('folder'),
|
||||
userService: service('user'),
|
||||
|
||||
beforeModel() {
|
||||
return new EmberPromise((resolve) => {
|
||||
this.get('documentService').fetchPages(this.paramsFor('document').document_id, this.get('session.user.id')).then((data) => {
|
||||
this.set('pages', data);
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
model() {
|
||||
let document = this.modelFor('document').document;
|
||||
this.browser.setTitle(document.get('name'));
|
||||
|
|
@ -29,11 +38,12 @@ export default Route.extend(AuthenticatedRouteMixin, {
|
|||
folders: this.modelFor('document').folders,
|
||||
folder: this.modelFor('document').folder,
|
||||
document: this.modelFor('document').document,
|
||||
pages: this.get('documentService').getPages(this.modelFor('document').document.get('id')),
|
||||
pages: this.get('pages'),
|
||||
links: this.modelFor('document').links,
|
||||
sections: this.modelFor('document').sections,
|
||||
permissions: this.modelFor('document').permissions,
|
||||
roles: this.modelFor('document').roles
|
||||
roles: this.modelFor('document').roles,
|
||||
blocks: this.modelFor('document').blocks
|
||||
});
|
||||
},
|
||||
|
||||
|
|
@ -46,5 +56,6 @@ export default Route.extend(AuthenticatedRouteMixin, {
|
|||
controller.set('sections', model.sections);
|
||||
controller.set('permissions', model.permissions);
|
||||
controller.set('roles', model.roles);
|
||||
controller.set('blocks', model.blocks);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{{toolbar/nav-bar}}
|
||||
|
||||
{{toolbar/for-document document=document spaces=folders space=folder permissions=permissions roles=roles
|
||||
{{toolbar/for-document document=document spaces=folders space=folder permissions=permissions roles=roles tab=tab
|
||||
onDocumentDelete=(action 'onDocumentDelete')
|
||||
onSaveTemplate=(action 'onSaveTemplate')
|
||||
onSaveDocument=(action 'onSaveDocument')}}
|
||||
onSaveDocument=(action 'onSaveDocument')
|
||||
refresh=(action 'refresh')}}
|
||||
|
||||
<div id="doc-view" class="container">
|
||||
<div class="row">
|
||||
|
|
@ -11,26 +12,25 @@
|
|||
{{document/document-heading document=document permissions=permissions
|
||||
onSaveDocument=(action 'onSaveDocument')}}
|
||||
|
||||
{{document/document-meta document=document folder=folder folders=folders permissions=permissions
|
||||
{{document/document-meta document=document folder=folder folders=folders permissions=permissions pages=pages
|
||||
onSaveDocument=(action 'onSaveDocument')}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
{{document/document-toc document=document folder=folder pages=pages page=page
|
||||
permissions=permissions roles=roles currentPageId=pageId tab=tab
|
||||
onPageSequenceChange=(action 'onPageSequenceChange') onPageLevelChange=(action 'onPageLevelChange') onGotoPage=(action 'onGotoPage')}}
|
||||
permissions=permissions roles=roles tab=tab currentPageId=currentPageId onShowPage=(action 'onShowPage')
|
||||
onPageSequenceChange=(action 'onPageSequenceChange') onPageLevelChange=(action 'onPageLevelChange')}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row no-gutters">
|
||||
<div class="col-12">
|
||||
<div class="text-center mt-5 mb-5 non-printable">
|
||||
<div class="text-center non-printable document-tabnav">
|
||||
<ul class="tabnav-control">
|
||||
<li class="tab {{if (eq tab 'content') 'selected'}}" {{action 'onTabChange' 'content'}}>Content</li>
|
||||
<li class="tab {{if (eq tab 'attachment') 'selected'}}" {{action 'onTabChange' 'attachment'}}>Attachments</li>
|
||||
{{#if session.authenticated}}
|
||||
<li class="tab {{if (eq tab 'activity') 'selected'}}" {{action 'onTabChange' 'activity'}}>Activity</li>
|
||||
<li class="tab {{if (eq tab 'revision') 'selected'}}" {{action 'onTabChange' 'revision'}}>Revisions</li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
|
|
@ -38,20 +38,17 @@
|
|||
|
||||
{{#if (eq tab 'content')}}
|
||||
{{document/view-content
|
||||
document=document links=links pages=pages
|
||||
folder=folder folders=folders sections=sections permissions=permissions pageId=pageId
|
||||
document=document links=links pages=pages blocks=blocks
|
||||
folder=folder folders=folders sections=sections permissions=permissions roles=roles
|
||||
onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection')
|
||||
onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') onGotoPage=(action 'onGotoPage')
|
||||
onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}}
|
||||
onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock')
|
||||
onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted') refresh=(action 'refresh')}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq tab 'attachment')}}
|
||||
{{document/view-attachment document=document permissions=permissions}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq tab 'activity')}}
|
||||
{{document/view-activity document=document pages=pages permissions=permissions}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq tab 'revision')}}
|
||||
{{document/view-revision document=document folder=folder pages=pages onRollback=(action 'onRollback')}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue