From 4b194329b13230b3d4a556738b40abc5b448c409 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Fri, 21 Feb 2020 12:10:32 +0100 Subject: [PATCH] fix empty subject --- .../app/sendedResource/sended-resource-list.component.html | 4 +--- .../app/sendedResource/sended-resource-list.component.ts | 2 +- src/frontend/lang/lang-en.ts | 1 + src/frontend/lang/lang-fr.ts | 1 + src/frontend/lang/lang-nl.ts | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/frontend/app/sendedResource/sended-resource-list.component.html b/src/frontend/app/sendedResource/sended-resource-list.component.html index 6d286f9f642..556cf19ad14 100644 --- a/src/frontend/app/sendedResource/sended-resource-list.component.html +++ b/src/frontend/app/sendedResource/sended-resource-list.component.html @@ -48,9 +48,7 @@ </div> </span> </div> - <div class="desc"> - {{row.desc}} - </div> + <div class="desc" [innerHTML]="row.desc"></div> <div class="contact"> <span *ngIf="row.sender" style="white-space: pre;overflow: hidden;text-overflow: ellipsis;" [title]="row.sender"> {{lang.senderShort}} : {{row.sender}} diff --git a/src/frontend/app/sendedResource/sended-resource-list.component.ts b/src/frontend/app/sendedResource/sended-resource-list.component.ts index b789bbfe524..0732d662ec0 100644 --- a/src/frontend/app/sendedResource/sended-resource-list.component.ts +++ b/src/frontend/app/sendedResource/sended-resource-list.component.ts @@ -132,7 +132,7 @@ export class SendedResourceListComponent implements OnInit { sendDate: item.send_date, type: 'email', typeColor: '#5bc0de', - desc: item.object, + desc: !this.functions.empty(item.object) ? item.object : `<i>${this.lang.emptySubject}<i>`, status: item.status, hasAttach: !this.functions.empty(item.document.attachments), hasNote: !this.functions.empty(item.document.notes), diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index f37dc992192..a8ff9e333a8 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1552,4 +1552,5 @@ export const LANG_EN = { "mergeWith" : "Merge with", "willBeTransferedToNewTag" : "will be transfered to selected tag", "detailDoc" : "Detail page", + "emptySubject" : "Empty subject", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 91f1a472fa5..b20d6ff846f 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1591,4 +1591,5 @@ export const LANG_FR = { "mergeWith" : "Fusionner avec", "willBeTransferedToNewTag" : "seront transférés au mot clé sélectionné", "detailDoc" : "Fiche détaillé", + "emptySubject" : "Objet vide", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 15d83ef073d..89eed64f13c 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1577,4 +1577,5 @@ export const LANG_NL = { "mergeWith" : "Merge with", //_TO_TRANSLATE "willBeTransferedToNewTag" : "will be transfered to selected tag", //_TO_TRANSLATE "detailDoc" : "Detail page", //_TO_TRANSLATE + "emptySubject" : "Empty subject", //_TO_TRANSLATE }; -- GitLab