From 160f4750c235e362449f70afe60167916d9deb6e Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 18 Nov 2019 10:47:50 +0100
Subject: [PATCH] FEAT #11282 TIME 0:40 merge custom fields
---
.../controllers/MergeController.php | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index b940216e3de..6e73df5e1da 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -255,6 +255,18 @@ class MergeController
'time' => date('H:i')
];
+ // Custom fields
+ $customFields = [];
+ if (!empty($args['customFields'])) {
+ foreach ($args['customFields'] as $key => $customField) {
+ if (is_array($customField)) {
+ $customFields[$key] .= implode("\n", $customField);
+ } else {
+ $customFields[$key] .= $customField;
+ }
+ }
+ }
+
$dataToBeMerge['res_letterbox'] = $resource;
$dataToBeMerge['initiator'] = empty($initiator) ? [] : $initiator;
$dataToBeMerge['parentInitiator'] = empty($parentInitiator) ? [] : $parentInitiator;
@@ -269,6 +281,7 @@ class MergeController
$dataToBeMerge['contact'] = [];
$dataToBeMerge['notes'] = $mergedNote;
$dataToBeMerge['datetime'] = $datetime;
+ $dataToBeMerge['custom'] = $customFields;
return $dataToBeMerge;
}
--
GitLab