From 0438c88523268f1faa0c45c0b15a2dc49875c86e Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 15 May 2020 14:41:14 +0200
Subject: [PATCH] FEAT #12091 TIME 2:00 fix empty contact clickable in basket
list
---
src/frontend/app/list/basket-list.component.html | 2 +-
src/frontend/app/list/basket-list.component.ts | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 1786b5a2fca..499fbdfa7eb 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -64,7 +64,7 @@
overflow: hidden;
text-overflow: ellipsis;
padding-left: 5px;
- padding-right: 5px;" [class.hasEvent]="data.event" (click)="launchEventSubData(data, row)">
+ padding-right: 5px;" [class.hasEvent]="data.event && data.displayValue !== this.lang.undefined" (click)="launchEventSubData(data, row)">
<ng-container *ngIf="data.value == 'getCreationAndProcessLimitDates'">
<ng-container *ngIf="row.closing_date != lang.undefined">
<i class="fa fa-lock" title="{{lang.closingDate}}"></i> <span
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index b8210769567..23c248b77cf 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -318,8 +318,10 @@ export class BasketListComponent implements OnInit, OnDestroy {
if (key.displayValue.length > 1) {
key.displayTitle = key.displayValue.join(' - ');
key.displayValue = '<b>' + key.displayValue.length + '</b> ' + this.lang.contactsAlt;
- } else {
+ } else if (key.displayValue.length === 1) {
key.displayValue = key.displayValue[0];
+ } else {
+ key.displayValue = this.lang.undefined;
}
} else if (key.value === 'getCreationAndProcessLimitDates') {
key.icon = '';
@@ -474,7 +476,7 @@ export class BasketListComponent implements OnInit, OnDestroy {
launchEventSubData(data: any, row: any) {
if (data.event) {
- if (['getSenders', 'getRecipients'].indexOf(data.value) > -1) {
+ if (['getSenders', 'getRecipients'].indexOf(data.value) > -1 && data.displayValue !== this.lang.undefined) {
const mode = data.value === 'getSenders' ? 'senders' : 'recipients';
this.openContact(row, mode);
}
--
GitLab