Merge branch 'fix/20572/21.03' into '21.03'

[20572] Contact de mail avec la valeur Null (21.03)

See merge request maarch/MaarchCourrier!673

src/frontend/plugins/mail-editor/mail-editor.component.ts

@@ -636,8 +636,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;
                         }