From 552a2a77d5b62322e144ed3fea73e2ff75fb4ea9 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 3 Mar 2020 11:14:58 +0100
Subject: [PATCH] FIX #12072 TIME 0:30 display empty subject in mail resume +
fix error with status AR sent
---
src/frontend/app/mail/mail-resume/mail-resume.component.html | 3 +--
src/frontend/app/mail/mail-resume/mail-resume.component.ts | 2 +-
.../app/sentResource/sent-resource-list.component.html | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/mail/mail-resume/mail-resume.component.html b/src/frontend/app/mail/mail-resume/mail-resume.component.html
index 06030e93256..c4bca4bb75e 100644
--- a/src/frontend/app/mail/mail-resume/mail-resume.component.html
+++ b/src/frontend/app/mail/mail-resume/mail-resume.component.html
@@ -16,8 +16,7 @@
</div>
</ng-template>
- <div class="info" [class.arType]="mail.type === 'aknowledgement_receipt'">
- {{mail.object | shorten: 110: '...'}}
+ <div class="info" [class.arType]="mail.type === 'aknowledgement_receipt'" [innerHTML]="mail.object | shorten: 110: '...'">
</div>
<div class="date">
diff --git a/src/frontend/app/mail/mail-resume/mail-resume.component.ts b/src/frontend/app/mail/mail-resume/mail-resume.component.ts
index cf8f35f18fd..02fd63fb88d 100644
--- a/src/frontend/app/mail/mail-resume/mail-resume.component.ts
+++ b/src/frontend/app/mail/mail-resume/mail-resume.component.ts
@@ -54,7 +54,7 @@ export class MailResumeComponent implements OnInit {
}
return {
- object: object,
+ object: !this.functions.empty(object) ? object : `<i>${this.lang.emptySubject}<i>`,
send_date: elem.send_date,
status: elem.status,
userInfo: elem.userInfo,
diff --git a/src/frontend/app/sentResource/sent-resource-list.component.html b/src/frontend/app/sentResource/sent-resource-list.component.html
index 7b5ffbb0df4..4c1b61d14bc 100644
--- a/src/frontend/app/sentResource/sent-resource-list.component.html
+++ b/src/frontend/app/sentResource/sent-resource-list.component.html
@@ -33,7 +33,7 @@
<span *ngIf="row.status === 'ERROR'" style="flex:1;color:red;font-weight: bold;">
{{lang.notSent}}
</span>
- <span *ngIf="row.type == 'acknowledgementReceipt' && functions.empty(row.sendDate)" style="flex:1;color:orange">
+ <span *ngIf="row.status !== 'ERROR' && row.type == 'acknowledgementReceipt' && functions.empty(row.sendDate)" style="flex:1;color:orange">
{{lang.manualSendingAR}}
</span>
<span style="flex:1" *ngIf="!functions.empty(row.operationDate)" [title]="row.operationDate | fullDate">
--
GitLab