From 95072951c27b93ced26dff7f1034f1c7d58e1795 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Tue, 10 Nov 2020 13:46:33 +0100
Subject: [PATCH] FIX #15145 TIME 0:05 fix duplicate contact on notes
---
src/app/contact/controllers/ContactController.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php
index 7d11c521bca..1ed9db09a66 100755
--- a/src/app/contact/controllers/ContactController.php
+++ b/src/app/contact/controllers/ContactController.php
@@ -863,7 +863,8 @@ class ContactController
'department' => 'department',
'function' => 'function',
'email' => 'email',
- 'phone' => 'phone'
+ 'phone' => 'phone',
+ 'notes' => 'notes'
];
if (!Validator::arrayType()->notEmpty()->validate($queryParams['criteria'])) {
@@ -968,6 +969,7 @@ class ContactController
'department' => $contact['department'],
'email' => $contact['email'],
'phone' => $contact['phone'],
+ 'notes' => $contact['notes'],
'isUsed' => $contactsUsed[$contact['id']],
'filling' => $filling,
'customFields' => !empty($contact['custom_fields']) ? json_decode($contact['custom_fields'], true) : null,
@@ -995,7 +997,7 @@ class ContactController
}
$fields = ['civility', 'firstname', 'lastname', 'company', 'address_number', 'address_street', 'address_additional1', 'address_additional2',
- 'address_postcode', 'address_town', 'address_country', 'department', 'function', 'email', 'phone', 'custom_fields', 'external_id'];
+ 'address_postcode', 'address_town', 'address_country', 'department', 'function', 'email', 'phone', 'custom_fields', 'external_id', 'notes'];
$master = ContactModel::getById([
'select' => $fields,
--
GitLab