From 2b06eda964e748a2aebda72d377b000a2d9580df Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 16 Mar 2020 12:01:49 +0100
Subject: [PATCH] FEAT #13465 TIME 0:30 fix ext
---
.../sent-resource-page/sent-resource-page.component.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
index a6f2a1ae7c0..965d7a1337b 100644
--- a/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
+++ b/src/frontend/app/sentResource/sent-resource-page/sent-resource-page.component.ts
@@ -140,7 +140,6 @@ export class SentResourcePageComponent implements OnInit {
base_url: '../../node_modules/tinymce/',
setup: (editor: any) => {
editor.on('init', (e: any) => {
- console.log('The Editor has initialized.');
this.loading = false;
});
},
@@ -357,6 +356,7 @@ export class SentResourcePageComponent implements OnInit {
});
} else if (element === 'isLinked' && data.document.isLinked === true) {
this.emailAttach.document.isLinked = true;
+ this.emailAttach.document.format = data.document.original || data.document.original === undefined ? this.emailAttachTool.document.list[0].format : 'pdf',
this.emailAttach.document.original = data.document.original;
this.emailAttach.document.size = this.emailAttach.document.original ? this.emailAttachTool.document.list[0].size : this.emailAttachTool.document.list[0].convertedDocument.size
}
@@ -692,6 +692,7 @@ export class SentResourcePageComponent implements OnInit {
if (type === 'document') {
if (this.emailAttach.document.isLinked === false) {
this.emailAttach.document.isLinked = true;
+ this.emailAttach.document.format = mode !== 'pdf' ? item.format : 'pdf',
this.emailAttach.document.original = mode !== 'pdf';
this.emailAttach.document.size = mode === 'pdf' ? item.convertedDocument.size : item.size;
}
--
GitLab