mirror of
https://github.com/documize/community.git
synced 2025-07-24 15:49:44 +02:00
Move revisions to new ui framework
This commit is contained in:
sauls8t
parent
2042454e77
commit
3c81297fc6
19 changed files with 288 additions and 190 deletions
|
|
@ -21,7 +21,6 @@ export default Controller.extend(Notifier, {
|
|||
linkService: service('link'),
|
||||
router: service(),
|
||||
sidebarTab: 'toc',
|
||||
tab: 'content',
|
||||
queryParams: ['currentPageId', 'source'],
|
||||
|
||||
actions: {
|
||||
|
|
@ -29,15 +28,7 @@ export default Controller.extend(Notifier, {
|
|||
this.set('sidebarTab', tab);
|
||||
},
|
||||
|
||||
onTabChange(tab) {
|
||||
this.set('tab', tab);
|
||||
if (tab === 'content') {
|
||||
this.send('refresh');
|
||||
}
|
||||
},
|
||||
|
||||
onShowPage(pageId) {
|
||||
this.set('tab', 'content');
|
||||
this.get('browser').scrollTo(`#page-${pageId}`);
|
||||
},
|
||||
|
||||
|
|
@ -222,13 +213,6 @@ export default Controller.extend(Notifier, {
|
|||
});
|
||||
},
|
||||
|
||||
onRollback(pageId, revisionId) {
|
||||
this.get('documentService').rollbackPage(this.get('document.id'), pageId, revisionId).then(() => {
|
||||
this.set('tab', 'content');
|
||||
this.get('target._routerMicrolib').refresh();
|
||||
});
|
||||
},
|
||||
|
||||
onEditMeta() {
|
||||
if (!this.get('permissions.documentEdit')) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -75,38 +75,25 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{{#if (eq tab "content")}}
|
||||
{{document/view-content
|
||||
roles=roles
|
||||
links=links
|
||||
pages=pages
|
||||
blocks=blocks
|
||||
folder=folder
|
||||
folders=folders
|
||||
sections=sections
|
||||
document=document
|
||||
permissions=permissions
|
||||
currentPageId=currentPageId
|
||||
refresh=(action "refresh")
|
||||
onSavePage=(action "onSavePage")
|
||||
onCopyPage=(action "onCopyPage")
|
||||
onMovePage=(action "onMovePage")
|
||||
onDeletePage=(action "onPageDeleted")
|
||||
onInsertSection=(action "onInsertSection")
|
||||
onSavePageAsBlock=(action "onSavePageAsBlock")
|
||||
onPageLevelChange=(action "onPageLevelChange")
|
||||
onPageSequenceChange=(action "onPageSequenceChange")}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq tab "revision")}}
|
||||
{{#if showRevisions}}
|
||||
{{document/view-revision
|
||||
pages=pages
|
||||
folder=folder
|
||||
document=document
|
||||
permissions=permissions
|
||||
onRollback=(action "onRollback")}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
{{document/view-content
|
||||
roles=roles
|
||||
links=links
|
||||
pages=pages
|
||||
blocks=blocks
|
||||
folder=folder
|
||||
folders=folders
|
||||
sections=sections
|
||||
document=document
|
||||
permissions=permissions
|
||||
currentPageId=currentPageId
|
||||
refresh=(action "refresh")
|
||||
onSavePage=(action "onSavePage")
|
||||
onCopyPage=(action "onCopyPage")
|
||||
onMovePage=(action "onMovePage")
|
||||
onDeletePage=(action "onPageDeleted")
|
||||
onInsertSection=(action "onInsertSection")
|
||||
onSavePageAsBlock=(action "onSavePageAsBlock")
|
||||
onPageLevelChange=(action "onPageLevelChange")
|
||||
onPageSequenceChange=(action "onPageSequenceChange")}}
|
||||
{{/layout/master-content}}
|
||||
|
||||
|
|
|
|||
33
gui/app/pods/document/revisions/controller.js
Normal file
33
gui/app/pods/document/revisions/controller.js
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
|
||||
//
|
||||
// This software (Documize Community Edition) is licensed under
|
||||
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
|
||||
//
|
||||
// You can operate outside the AGPL restrictions by purchasing
|
||||
// Documize Enterprise Edition and obtaining a commercial license
|
||||
// by contacting <sales@documize.com>.
|
||||
//
|
||||
// https://documize.com
|
||||
|
||||
import { inject as service } from '@ember/service';
|
||||
import Notifier from '../../../mixins/notifier';
|
||||
import Controller from '@ember/controller';
|
||||
|
||||
export default Controller.extend(Notifier, {
|
||||
documentService: service('document'),
|
||||
router: service(),
|
||||
selectedRevision: null,
|
||||
|
||||
actions: {
|
||||
onRevision(revision) {
|
||||
this.set('selectedRevision', revision);
|
||||
},
|
||||
|
||||
onRollback(pageId, revisionId) {
|
||||
this.get('documentService').rollbackPage(this.get('document.id'), pageId, revisionId).then(() => {
|
||||
this.notifySuccess('Reverted to selected revision');
|
||||
this.get('router').transitionTo('document.index');
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
75
gui/app/pods/document/revisions/route.js
Normal file
75
gui/app/pods/document/revisions/route.js
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
|
||||
//
|
||||
// This software (Documize Community Edition) is licensed under
|
||||
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
|
||||
//
|
||||
// You can operate outside the AGPL restrictions by purchasing
|
||||
// Documize Enterprise Edition and obtaining a commercial license
|
||||
// by contacting <sales@documize.com>.
|
||||
//
|
||||
// https://documize.com
|
||||
|
||||
import { set } from '@ember/object';
|
||||
import { Promise as EmberPromise, hash } from 'rsvp';
|
||||
import { inject as service } from '@ember/service';
|
||||
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
|
||||
import Route from '@ember/routing/route';
|
||||
|
||||
export default Route.extend(AuthenticatedRouteMixin, {
|
||||
docSvc: service('document'),
|
||||
linkService: service('link'),
|
||||
folderService: service('folder'),
|
||||
userService: service('user'),
|
||||
|
||||
beforeModel() {
|
||||
return new EmberPromise((resolve) => {
|
||||
let doc = this.modelFor('document').document;
|
||||
|
||||
this.get('docSvc').getDocumentRevisions(doc.get('id')).then((revisions) => {
|
||||
revisions.forEach((r) => {
|
||||
set(r, 'deleted', r.revisions === 0);
|
||||
});
|
||||
|
||||
this.set('revisions', revisions);
|
||||
|
||||
resolve(revisions)
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
model() {
|
||||
return hash({
|
||||
folders: this.modelFor('document').folders,
|
||||
folder: this.modelFor('document').folder,
|
||||
document: this.modelFor('document').document,
|
||||
pages: this.get('pages'),
|
||||
permissions: this.modelFor('document').permissions,
|
||||
roles: this.modelFor('document').roles,
|
||||
revisions: this.get('revisions')
|
||||
});
|
||||
},
|
||||
|
||||
setupController(controller, model) {
|
||||
this._super(controller, model);
|
||||
|
||||
controller.set('folders', model.folders);
|
||||
controller.set('folder', model.folder);
|
||||
controller.set('document', model.document);
|
||||
controller.set('pages', model.pages);
|
||||
controller.set('permissions', model.permissions);
|
||||
controller.set('roles', model.roles);
|
||||
controller.set('revisions', model.revisions);
|
||||
|
||||
if (model.revisions.length > 0) {
|
||||
controller.set('selectedRevision', model.revisions[0]);
|
||||
}
|
||||
},
|
||||
|
||||
activate: function () {
|
||||
this._super(...arguments);
|
||||
|
||||
let document = this.modelFor('document').document;
|
||||
this.browser.setTitleWithoutSuffix(document.get('name'));
|
||||
this.browser.setMetaDescription(document.get('excerpt'));
|
||||
}
|
||||
});
|
||||
38
gui/app/pods/document/revisions/template.hbs
Normal file
38
gui/app/pods/document/revisions/template.hbs
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{{#layout/master-sidebar}}
|
||||
{{ui/ui-spacer size=300}}
|
||||
|
||||
{{#link-to "document.index"}}
|
||||
{{ui/ui-button color=constants.Color.Yellow light=true icon=constants.Icon.ArrowLeft label="Document"}}
|
||||
{{/link-to}}
|
||||
|
||||
{{ui/ui-spacer size=400}}
|
||||
|
||||
<div class="section">
|
||||
<div class="title">REVISIONS</div>
|
||||
<div class="list">
|
||||
{{#each revisions as |revision|}}
|
||||
<div class="item {{if (eq selectedRevision revision) "selected"}}" {{action "onRevision" revision}}>
|
||||
<i class={{concat "dicon " constants.Icon.TriangleSmallRight}} />
|
||||
<div class="name">{{formatted-date revision.created}}</div>
|
||||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
{{/layout/master-sidebar}}
|
||||
|
||||
{{#layout/master-content}}
|
||||
{{layout/logo-heading
|
||||
title="Content Revisions"
|
||||
desc="Review previous content changes and roll back edits"
|
||||
icon=constants.Icon.TimeBack}}
|
||||
|
||||
{{document/view-revision
|
||||
pages=pages
|
||||
folder=folder
|
||||
document=document
|
||||
permissions=permissions
|
||||
revisions=revisions
|
||||
revision=selectedRevision
|
||||
onRollback=(action "onRollback")}}
|
||||
{{/layout/master-content}}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue