Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
96195e97
Commit
96195e97
authored
Dec 08, 2021
by
Hamza HRAMCHI
Browse files
FIX #18927 TIME 0:35 send signed attachment after draft
parent
ad03e55e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/frontend/plugins/mail-editor/mail-editor.component.ts
View file @
96195e97
...
...
@@ -921,7 +921,12 @@ export class MailEditorComponent implements OnInit, OnDestroy {
});
}
saveDraft
()
{
async
saveDraft
()
{
for
(
let
i
=
0
;
i
<
this
.
emailAttach
.
attachments
.
length
;
i
++
)
{
await
this
.
getSignedAttachment
(
this
.
emailAttach
.
attachments
[
i
].
id
);
this
.
emailAttach
.
attachments
[
i
].
id
=
this
.
signedAttachId
!==
null
?
this
.
signedAttachId
:
this
.
emailAttach
.
attachments
[
i
].
id
;
this
.
emailAttach
.
attachments
[
i
].
original
=
false
;
}
return
new
Promise
(
async
(
resolve
)
=>
{
if
(
!
this
.
readonly
&&
!
this
.
functions
.
empty
(
tinymce
.
get
(
'
emailSignature
'
).
getContent
()))
{
this
.
emailStatus
=
'
DRAFT
'
;
...
...
@@ -988,11 +993,6 @@ export class MailEditorComponent implements OnInit, OnDestroy {
}
}
});
objAttach
.
attachments
.
forEach
(
async
(
element
:
any
,
index
:
number
)
=>
{
await
this
.
getSignedAttachment
(
element
.
id
);
objAttach
.
attachments
[
index
].
id
=
this
.
signedAttachId
!==
null
?
this
.
signedAttachId
:
element
.
id
;
objAttach
.
attachments
[
index
].
original
=
false
;
});
const
formatSender
=
{
email
:
this
.
currentSender
.
email
,
entityId
:
!
this
.
functions
.
empty
(
this
.
currentSender
.
entityId
)
?
this
.
currentSender
.
entityId
:
null
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment