diff --git a/gui/app/components/customize/archive-admin.js b/gui/app/components/customize/archive-admin.js deleted file mode 100644 index 33863578..00000000 --- a/gui/app/components/customize/archive-admin.js +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Documize Inc. . 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 . -// -// https://documize.com - -import AuthProvider from '../../mixins/auth'; -import ModalMixin from '../../mixins/modal'; -import Component from '@ember/component'; - -export default Component.extend(AuthProvider, ModalMixin, { - - init() { - this._super(...arguments); - }, - - actions: { - } -}); diff --git a/gui/app/components/folder/settings-delete.js b/gui/app/components/folder/settings-delete.js new file mode 100644 index 00000000..33a24dfb --- /dev/null +++ b/gui/app/components/folder/settings-delete.js @@ -0,0 +1,44 @@ +// Copyright 2016 Documize Inc. . 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 . +// +// https://documize.com + +import $ from 'jquery'; +import { inject as service } from '@ember/service'; +import AuthMixin from '../../mixins/auth'; +import Notifier from '../../mixins/notifier'; +import Component from '@ember/component'; + +export default Component.extend(AuthMixin, Notifier, { + router: service(), + spaceSvc: service('folder'), + localStorage: service('localStorage'), + deleteSpaceName: '', + + actions: { + onDelete(e) { + e.preventDefault(); + + let spaceName = this.get('space').get('name'); + let spaceNameTyped = this.get('deleteSpaceName'); + + if (spaceNameTyped !== spaceName || spaceNameTyped === '' || spaceName === '') { + $("#delete-space-name").addClass("is-invalid").focus(); + return; + } + + $("#delete-space-name").removeClass("is-invalid"); + + this.get('spaceSvc').delete(this.get('space.id')).then(() => { /* jshint ignore:line */ + this.get('localStorage').clearSessionItem('folder'); + this.get('router').transitionTo('folders'); + }); + } + } +}); diff --git a/gui/app/components/toolbar/for-space.js b/gui/app/components/toolbar/for-space.js index f88213e3..9d2297db 100644 --- a/gui/app/components/toolbar/for-space.js +++ b/gui/app/components/toolbar/for-space.js @@ -178,26 +178,6 @@ export default Component.extend(ModalMixin, TooltipMixin, AuthMixin, Notifier, { return true; }, - onSpaceDelete(e) { - e.preventDefault(); - - let spaceName = this.get('space').get('name'); - let spaceNameTyped = this.get('deleteSpaceName'); - - if (spaceNameTyped !== spaceName || spaceNameTyped === '' || spaceName === '') { - $("#delete-space-name").addClass("is-invalid").focus(); - return; - } - - this.set('deleteSpaceName', ''); - $("#delete-space-name").removeClass("is-invalid"); - - let cb = this.get('onDeleteSpace'); - cb(this.get('space.id')); - - this.modalClose('#space-delete-modal'); - }, - onShowEmptyDocModal() { this.modalOpen("#empty-doc-modal", {"show": true}, '#empty-doc-name'); }, diff --git a/gui/app/pods/customize/archive/controller.js b/gui/app/pods/customize/archive/controller.js deleted file mode 100644 index f5539165..00000000 --- a/gui/app/pods/customize/archive/controller.js +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2016 Documize Inc. . 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 . -// -// https://documize.com - -import Controller from '@ember/controller'; - -export default Controller.extend({ - actions: { - } -}); diff --git a/gui/app/pods/customize/archive/route.js b/gui/app/pods/customize/archive/route.js deleted file mode 100644 index 79424e88..00000000 --- a/gui/app/pods/customize/archive/route.js +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Documize Inc. . 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 . -// -// https://documize.com - -import Route from '@ember/routing/route'; -import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; - -export default Route.extend(AuthenticatedRouteMixin, { - beforeModel() { - if (!this.session.isAdmin) { - this.transitionTo('auth.login'); - } - }, - - activate() { - this.get('browser').setTitle('Archive'); - } -}); diff --git a/gui/app/pods/customize/archive/template.hbs b/gui/app/pods/customize/archive/template.hbs deleted file mode 100644 index b830b27a..00000000 --- a/gui/app/pods/customize/archive/template.hbs +++ /dev/null @@ -1 +0,0 @@ -{{customize/archive-admin}} \ No newline at end of file diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs index 966aa1bf..54ab043f 100644 --- a/gui/app/pods/customize/template.hbs +++ b/gui/app/pods/customize/template.hbs @@ -37,9 +37,6 @@ {{#link-to 'customize.audit' activeClass='selected' class="tab tab-vertical" tagName="li" }}Audit{{/link-to}} {{/if}} {{/if}} - {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} - {{#link-to 'customize.archive' activeClass='selected' class="tab tab-vertical" tagName="li" }}Archive{{/link-to}} - {{/if}}
diff --git a/gui/app/pods/folder/index/controller.js b/gui/app/pods/folder/index/controller.js index 3af6d63c..2af21aff 100644 --- a/gui/app/pods/folder/index/controller.js +++ b/gui/app/pods/folder/index/controller.js @@ -25,13 +25,6 @@ export default Controller.extend(NotifierMixin, { filteredDocs: null, actions: { - onDeleteSpace(id) { - this.get('folderService').delete(id).then(() => { /* jshint ignore:line */ - this.get('localStorage').clearSessionItem('folder'); - this.transitionToRoute('folders'); - }); - }, - onRefresh() { this.get('target._routerMicrolib').refresh(); }, diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs index 9c945d7a..9dbf9248 100644 --- a/gui/app/pods/folder/index/template.hbs +++ b/gui/app/pods/folder/index/template.hbs @@ -16,8 +16,7 @@ category=category categories=model.categories documents=filteredDocs - onRefresh=(action 'onRefresh') - onDeleteSpace=(action 'onDeleteSpace')}} + onRefresh=(action 'onRefresh')}} {{folder/documents-list documents=filteredDocs diff --git a/gui/app/pods/folder/settings/controller.js b/gui/app/pods/folder/settings/controller.js index 9adca9d4..393d3c3d 100644 --- a/gui/app/pods/folder/settings/controller.js +++ b/gui/app/pods/folder/settings/controller.js @@ -17,6 +17,7 @@ export default Controller.extend(NotifierMixin, { router: service(), folderService: service('folder'), localStorage: service('localStorage'), + appMeta: service(), queryParams: ['tab'], tab: 'general', diff --git a/gui/app/pods/folder/settings/route.js b/gui/app/pods/folder/settings/route.js index d95caf15..e42735a2 100644 --- a/gui/app/pods/folder/settings/route.js +++ b/gui/app/pods/folder/settings/route.js @@ -10,7 +10,6 @@ // https://documize.com import { 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'; diff --git a/gui/app/pods/folder/settings/template.hbs b/gui/app/pods/folder/settings/template.hbs index 507c07a6..8e5bbe7c 100644 --- a/gui/app/pods/folder/settings/template.hbs +++ b/gui/app/pods/folder/settings/template.hbs @@ -29,20 +29,48 @@ {{folder/settings-blocks permissions=model.permissions space=model.folder}} {{/if}} + {{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}} + {{#if (eq tab 'archived')}} + {{enterprise/space-archived permissions=model.permissions spaces=model.folder space=model.folder}} + {{/if}} + {{/if}} + {{#if (eq tab 'categories')}} {{folder/settings-category permissions=model.permissions spaces=model.folder space=model.folder}} {{/if}} + + {{#if (eq tab 'deletion')}} + {{folder/settings-delete permissions=model.permissions spaces=model.folder space=model.folder}} + {{/if}} {{/layout/middle-zone-content}} {{#layout/middle-zone-sidebar}}