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 06030e932563da7e0b3b96dd0bf9f645215164f1..c4bca4bb75ec2fc3a1c0adae800302775eb56f3f 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 cf8f35f18fdfb5d2c83ce7cf0adaafb8145dace8..02fd63fb88de9b5a3e0128da6b5b70c95c7551ae 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 7b5ffbb0df40d53392ff0a8ec09d2265d1d648c4..4c1b61d14bc729d849919152a81373c533ea2532 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">