Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
d05c6716
Commit
d05c6716
authored
Oct 21, 2021
by
Guillaume Heurtier
Browse files
FIX #18428 TIME 0:20 fix communication means format in autocomplete contacts for m2m
parent
cf89362b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/app/contact/controllers/ContactController.php
View file @
d05c6716
...
...
@@ -1505,6 +1505,7 @@ class ContactController
if
(
!
empty
(
$contactRaw
[
'communication_means'
]))
{
$communicationMeans
=
json_decode
(
$contactRaw
[
'communication_means'
],
true
);
unset
(
$communicationMeans
[
'password'
]);
$contact
[
'communicationMeans'
]
=
!
empty
(
$communicationMeans
)
?
$communicationMeans
:
null
;
}
...
...
src/core/controllers/AutoCompleteController.php
View file @
d05c6716
...
...
@@ -838,8 +838,9 @@ class AutoCompleteController
$externalId
=
json_decode
(
$contact
[
'external_id'
],
true
);
$communicationMeans
=
json_decode
(
$contact
[
'communication_means'
],
true
);
unset
(
$communicationMeans
[
'password'
]);
$autoContact
[
'm2m'
]
=
$externalId
[
'm2m'
];
$autoContact
[
'communicationMeans'
]
=
$communicationMeans
[
'url'
]
??
$communicationMeans
[
'email'
]
;
$autoContact
[
'communicationMeans'
]
=
$communicationMeans
??
null
;
$autocompleteData
[]
=
$autoContact
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment