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
b4357098
Commit
b4357098
authored
Apr 21, 2022
by
Hamza HRAMCHI
Browse files
FIX #20573 TIME 0:15 contact first/last name: check emptiness
parent
97cdca95
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/frontend/plugins/mail-editor/mail-editor.component.ts
View file @
b4357098
...
...
@@ -647,8 +647,12 @@ export class MailEditorComponent implements OnInit, OnDestroy {
data
=
data
.
filter
((
contact
:
any
)
=>
!
this
.
functions
.
empty
(
contact
.
email
)
||
contact
.
type
===
'
contactGroup
'
).
map
((
contact
:
any
)
=>
{
let
label
:
string
;
if
(
contact
.
type
===
'
user
'
||
contact
.
type
===
'
contact
'
)
{
if
(
!
this
.
functions
.
empty
(
contact
.
firstname
)
||
!
this
.
functions
.
empty
(
contact
.
lastname
))
{
label
=
contact
.
firstname
+
'
'
+
contact
.
lastname
;
if
(
!
this
.
functions
.
empty
(
contact
.
firstname
)
&&
!
this
.
functions
.
empty
(
contact
.
lastname
))
{
label
=
`
${
contact
.
firstname
}
${
contact
.
lastname
}
`
;
}
else
if
(
this
.
functions
.
empty
(
contact
.
firstname
)
&&
!
this
.
functions
.
empty
(
contact
.
lastname
))
{
label
=
contact
.
lastname
;
}
else
if
(
!
this
.
functions
.
empty
(
contact
.
firstname
)
&&
this
.
functions
.
empty
(
contact
.
lastname
))
{
label
=
contact
.
firstname
;
}
else
{
label
=
contact
.
company
;
}
...
...
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