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
ad03e55e
Commit
ad03e55e
authored
Dec 08, 2021
by
Hamza HRAMCHI
Browse files
FIX #18927 TIME 1:55 send signed attachment after draft
parent
d3ea97fb
Changes
1
Show whitespace changes
Inline
Side-by-side
src/frontend/plugins/mail-editor/mail-editor.component.ts
View file @
ad03e55e
...
@@ -312,7 +312,8 @@ export class MailEditorComponent implements OnInit, OnDestroy {
...
@@ -312,7 +312,8 @@ export class MailEditorComponent implements OnInit, OnDestroy {
await
this
.
getAttachElements
(
false
);
await
this
.
getAttachElements
(
false
);
const
attachIds
:
number
[]
=
this
.
emailAttachTool
.
attachments
.
list
.
map
((
item
:
any
)
=>
item
.
id
);
const
attachIds
:
number
[]
=
this
.
emailAttachTool
.
attachments
.
list
.
map
((
item
:
any
)
=>
item
.
id
);
this
.
emailAttach
.
attachments
.
forEach
((
element
:
any
,
index
:
number
)
=>
{
this
.
emailAttach
.
attachments
.
forEach
(
async
(
element
:
any
,
index
:
number
)
=>
{
await
this
.
getSignedAttachment
(
element
.
id
);
if
(
attachIds
.
indexOf
(
element
.
id
)
>
-
1
)
{
if
(
attachIds
.
indexOf
(
element
.
id
)
>
-
1
)
{
const
attachment
:
any
=
this
.
emailAttachTool
.
attachments
.
list
.
find
((
item
:
any
)
=>
item
.
id
===
element
.
id
);
const
attachment
:
any
=
this
.
emailAttachTool
.
attachments
.
list
.
find
((
item
:
any
)
=>
item
.
id
===
element
.
id
);
this
.
emailAttach
.
attachments
[
index
]
=
{
this
.
emailAttach
.
attachments
[
index
]
=
{
...
@@ -320,7 +321,8 @@ export class MailEditorComponent implements OnInit, OnDestroy {
...
@@ -320,7 +321,8 @@ export class MailEditorComponent implements OnInit, OnDestroy {
format
:
attachment
.
format
,
format
:
attachment
.
format
,
label
:
attachment
.
label
,
label
:
attachment
.
label
,
original
:
attachment
.
original
,
original
:
attachment
.
original
,
size
:
attachment
.
size
size
:
attachment
.
size
,
signedResponse
:
this
.
signedAttachId
}
}
}
}
});
});
...
@@ -980,13 +982,17 @@ export class MailEditorComponent implements OnInit, OnDestroy {
...
@@ -980,13 +982,17 @@ export class MailEditorComponent implements OnInit, OnDestroy {
objAttach
[
element
]
=
this
.
emailAttach
[
element
].
map
((
item
:
any
)
=>
item
.
id
);
objAttach
[
element
]
=
this
.
emailAttach
[
element
].
map
((
item
:
any
)
=>
item
.
id
);
}
else
{
}
else
{
objAttach
[
element
]
=
this
.
emailAttach
[
element
].
map
((
item
:
any
)
=>
({
objAttach
[
element
]
=
this
.
emailAttach
[
element
].
map
((
item
:
any
)
=>
({
id
:
element
===
'
attachments
'
&&
this
.
signedAttachId
!==
null
?
this
.
signedAttachId
:
item
.
id
,
id
:
item
.
id
,
original
:
item
.
original
original
:
item
.
original
}));
}));
}
}
}
}
});
});
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
=
{
const
formatSender
=
{
email
:
this
.
currentSender
.
email
,
email
:
this
.
currentSender
.
email
,
entityId
:
!
this
.
functions
.
empty
(
this
.
currentSender
.
entityId
)
?
this
.
currentSender
.
entityId
:
null
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