From 97b5d1ab0a28b6d55d799603ca7a0c52b579d090 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sat, 11 Jun 2022 11:27:53 +1200 Subject: [PATCH] Fix target contact label back to include target --- CRM/Activity/Import/Parser/Activity.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 502d678f9c..7be9d00708 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -220,13 +220,13 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Import_Parser { 'id', 'column_name' ); - $value = $customFieldId ? 'custom_' . $customFieldId : $value; - $tmpConatctField[trim($value)] = $contactFields[trim($value)]; - $tmpConatctField[trim($value)]['title'] = $tmpConatctField[trim($value)]['title'] . " (match to contact)"; + $value = trim($customFieldId ? 'custom_' . $customFieldId : $value); + $tmpConatctField[$value] = $contactFields[$value]; + $tmpConatctField[$value]['title'] = $tmpConatctField[$value]['title'] . " (match to contact)"; } } $tmpConatctField['external_identifier'] = $contactFields['external_identifier']; - $tmpConatctField['external_identifier']['title'] = $contactFields['external_identifier']['title'] . " (match to contact)"; + $tmpConatctField['external_identifier']['title'] = $contactFields['external_identifier']['title'] . ' (match to contact)'; $fields = array_merge($fields, $tmpConatctField); $fields = array_merge($fields, $tmpFields); $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Activity')); @@ -239,7 +239,13 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Import_Parser { 'options' => FALSE, 'type' => CRM_Utils_Type::T_INT, ], - 'target_contact_id' => $activityContact['contact_id'], + 'target_contact_id' => [ + 'title' => ts('Target Contact'), + 'headerPattern' => '/Target.Contact?/i', + 'name' => 'target_type_id', + 'options' => FALSE, + 'type' => CRM_Utils_Type::T_INT, + ], ]); $this->importableFieldsMetadata = $fields; } -- 2.25.1