From aa37e8c2e981d15328748f9ed45cc6f9a2c05a02 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 25 Sep 2020 10:03:32 +0200
Subject: [PATCH] FEAT #14006 TIME 0:15 fix registered mail recipient format in
list
---
src/app/resource/controllers/ResourceListController.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/app/resource/controllers/ResourceListController.php b/src/app/resource/controllers/ResourceListController.php
index a57ee27cb50..851c9a7e31b 100644
--- a/src/app/resource/controllers/ResourceListController.php
+++ b/src/app/resource/controllers/ResourceListController.php
@@ -952,7 +952,13 @@ class ResourceListController
} elseif ($value['value'] == 'getRegisteredMailRecipient') {
if (!empty($registeredMail)) {
$recipient = json_decode($registeredMail['recipient'], true);
- $recipient = $recipient['company'] . ' ' . $recipient['firstname'] . ' ' . $recipient['lastname'];
+ if (!empty($recipient['company']) && (!empty($recipient['firstname']) || !empty($recipient['lastname']))) {
+ $recipient = $recipient['firstname'] . ' ' . $recipient['lastname'] . ' (' . $recipient['company'] . ')';
+ } elseif (empty($recipient['company']) && (!empty($recipient['firstname']) || !empty($recipient['lastname']))) {
+ $recipient = $recipient['firstname'] . ' ' . $recipient['lastname'];
+ } elseif (!empty($recipient['company']) && empty($recipient['firstname']) && empty($recipient['lastname'])) {
+ $recipient = $recipient['company'];
+ }
$value['displayValue'] = $recipient;
} else {
$value['displayValue'] = '';
--
GitLab