1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-22 06:39:43 +02:00

fixed bug with app boot

This commit is contained in:
Harvey Kandola 2017-12-19 16:52:40 +00:00
parent 4de19dcbec
commit ca783dd323
9 changed files with 2673 additions and 1141 deletions

File diff suppressed because one or more lines are too long

View file

@ -41,6 +41,8 @@ export default Component.extend(ModalMixin, {
},
load() {
let permissions = this.get('permissions');
if (permissions.get('documentMove') || permissions.get('documentCopy')) {
this.get('documentService').getPageMoveCopyTargets().then((d) => {
let me = this.get('document');
@ -55,6 +57,7 @@ export default Component.extend(ModalMixin, {
this.set('documentList', A(d));
this.set('documentListOthers', A(d.filter((item) => item.get('id') !== me.get('id'))));
});
}
},
actions: {

View file

@ -29,7 +29,6 @@ export default Component.extend({
init() {
this._super(...arguments);
this.getAttachments();
},

View file

@ -136,6 +136,7 @@ export default Component.extend(TooltipMixin, {
},
loadBlocks() {
if (is.not.undefined(this.get('folder'))) {
this.get('sectionService').getSpaceBlocks(this.get('folder.id')).then((blocks) => {
if (this.get('isDestroyed') || this.get('isDestroying')) {
return;
@ -144,6 +145,7 @@ export default Component.extend(TooltipMixin, {
this.set('blocks', blocks);
this.set('hasBlocks', blocks.get('length') > 0);
});
}
},
actions: {

View file

@ -22,8 +22,8 @@
<div class="row no-gutters">
<div class="col-12">
<div class="text-center">
<ul class="tabnav-control mt-5 mb-5">
<div class="text-center mt-5 mb-5 non-printable">
<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}}

View file

@ -62,6 +62,9 @@ export default Service.extend({
return resolve(this);
}
return this.get('ajax').request('public/meta').then((response) => {
this.setProperties(response);
if (requestedRoute === 'secure') {
this.setProperties({
title: htmlSafe("Secure document viewing"),
@ -70,14 +73,7 @@ export default Service.extend({
});
this.get('localStorage').clearAll();
return resolve(this);
}
return this.get('ajax').request('public/meta').then((response) => {
this.setProperties(response);
if (is.not.include(requestedUrl, '/auth/')) {
} else if (is.not.include(requestedUrl, '/auth/')) {
this.get('localStorage').storeSessionItem('entryUrl', requestedUrl);
}

View file

@ -19,7 +19,7 @@
"author": "Documize Inc.",
"license": "AGPL",
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"broccoli-asset-rev": "^2.6.0",
"ember-ajax": "^3.0.0",
"ember-cli": "^2.17.1",
"ember-cli-app-version": "^3.0.0",

View file

@ -1082,7 +1082,7 @@ breakable@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1"
broccoli-asset-rev@^2.4.5:
broccoli-asset-rev@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/broccoli-asset-rev/-/broccoli-asset-rev-2.6.0.tgz#0633fc3a0b2ba0c2c1d56fa9feb7b331fc83be6d"
dependencies: