From bf5aa128a88302757171c14791ce67ed71b70cf0 Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Tue, 27 Oct 2020 11:55:47 +0100
Subject: [PATCH] FEAT #15261 TIME 1:05 Send an email with a user without
entities
---
.../sent-resource-page.component.ts | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
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 f1bded78ed0..80a2bef8bd3 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
@@ -452,11 +452,14 @@ export class SentResourcePageComponent implements OnInit {
setDefaultInfo() {
this.emailsubject = `[${this.resourceData.chrono}] ${this.resourceData.subject}`;
this.emailsubject = this.emailsubject.substring(0, 70);
- this.currentSender = this.availableSenders.filter(sender => sender.entityId === this.headerService.user.entities[0].id).length > 0 ? this.availableSenders.filter(sender => sender.entityId === this.headerService.user.entities[0].id)[0] : this.availableSenders[0];
- if (!this.functions.empty(this.resourceData.senders)) {
- this.resourceData.senders.forEach((sender: any) => {
- this.setSender(sender.id);
- });
+ const withEmptyId = this.availableSenders.filter((element) => element.entityId === null);
+ if (withEmptyId.length === 0) {
+ this.currentSender = this.availableSenders.filter(sender => sender.entityId === this.headerService.user.entities[0].id).length > 0 ? this.availableSenders.filter(sender => sender.entityId === this.headerService.user.entities[0].id)[0] : this.availableSenders[0];
+ if (!this.functions.empty(this.resourceData.senders)) {
+ this.resourceData.senders.forEach((sender: any) => {
+ this.setSender(sender.id);
+ });
+ }
}
}
--
GitLab