Skip to content
Snippets Groups Projects
Commit 552a2a77 authored by Florian Azizian's avatar Florian Azizian
Browse files

FIX #12072 TIME 0:30 display empty subject in mail resume + fix error with status AR sent

parent b9e687dc
No related branches found
No related tags found
No related merge requests found
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
</div> </div>
</ng-template> </ng-template>
<div class="info" [class.arType]="mail.type === 'aknowledgement_receipt'"> <div class="info" [class.arType]="mail.type === 'aknowledgement_receipt'" [innerHTML]="mail.object | shorten: 110: '...'">
{{mail.object | shorten: 110: '...'}}
</div> </div>
<div class="date"> <div class="date">
......
...@@ -54,7 +54,7 @@ export class MailResumeComponent implements OnInit { ...@@ -54,7 +54,7 @@ export class MailResumeComponent implements OnInit {
} }
return { return {
object: object, object: !this.functions.empty(object) ? object : `<i>${this.lang.emptySubject}<i>`,
send_date: elem.send_date, send_date: elem.send_date,
status: elem.status, status: elem.status,
userInfo: elem.userInfo, userInfo: elem.userInfo,
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<span *ngIf="row.status === 'ERROR'" style="flex:1;color:red;font-weight: bold;"> <span *ngIf="row.status === 'ERROR'" style="flex:1;color:red;font-weight: bold;">
{{lang.notSent}} {{lang.notSent}}
</span> </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}} {{lang.manualSendingAR}}
</span> </span>
<span style="flex:1" *ngIf="!functions.empty(row.operationDate)" [title]="row.operationDate | fullDate"> <span style="flex:1" *ngIf="!functions.empty(row.operationDate)" [title]="row.operationDate | fullDate">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment