dev/core#3673 do not attempt to report empty related contact

diff --git a/CRM/Contact/Import/Parser/Contact.php b/CRM/Contact/Import/Parser/Contact.php
index a64158677ab85145acc9d1d1a20df0f1483b46f8..50fd3d369613da50617660d65103f30b9aec1820 100644 (file)
--- a/CRM/Contact/Import/Parser/Contact.php
+++ b/CRM/Contact/Import/Parser/Contact.php
@@ -1436,14 +1436,16 @@ class CRM_Contact_Import_Parser_Contact extends CRM_Import_Parser {
       $locationValues = array_filter(array_intersect_key($mappedField, array_fill_keys($locationFields, 1)));
 
       if ($relatedContactKey) {
-        if (!isset($params['relationship'][$relatedContactKey])) {
-          $params['relationship'][$relatedContactKey] = [
-            // These will be over-written by any the importer has chosen but defaults are based on the relationship.
-            'contact_type' => $this->getRelatedContactType($mappedField['relationship_type_id'], $mappedField['relationship_direction']),
-            'contact_sub_type' => $this->getRelatedContactSubType($mappedField['relationship_type_id'], $mappedField['relationship_direction']),
-          ];
+        if ($importedValue !== '') {
+          if (!isset($params['relationship'][$relatedContactKey])) {
+            $params['relationship'][$relatedContactKey] = [
+              // These will be over-written by any the importer has chosen but defaults are based on the relationship.
+              'contact_type' => $this->getRelatedContactType($mappedField['relationship_type_id'], $mappedField['relationship_direction']),
+              'contact_sub_type' => $this->getRelatedContactSubType($mappedField['relationship_type_id'], $mappedField['relationship_direction']),
+            ];
+          }
+          $this->addFieldToParams($params['relationship'][$relatedContactKey], $locationValues, $fieldName, $importedValue);
         }
-        $this->addFieldToParams($params['relationship'][$relatedContactKey], $locationValues, $fieldName, $importedValue);
       }
       else {
         $this->addFieldToParams($params, $locationValues, $fieldName, $importedValue);

diff --git a/tests/phpunit/CRM/Contact/Import/Form/data/individual_related_create.csv b/tests/phpunit/CRM/Contact/Import/Form/data/individual_related_create.csv
index 4ae1fb27dd905e7d545386de8a4fb817dba75a8b..f3bed8b730e60685a0dbab266491f736b1c0dfb3 100644 (file)
--- a/tests/phpunit/CRM/Contact/Import/Form/data/individual_related_create.csv
+++ b/tests/phpunit/CRM/Contact/Import/Form/data/individual_related_create.csv
@@ -1,3 +1,5 @@
 First Name,Last Name,Dad first name,Dad Last name,Dad email
 Bob,Smith,William,The Kid,billy-the-kid@example.com
 Sarah,Smith,Bill,The Grandkid,Billy-the-grand-kid@example.com
+Jenny ,Smith,,,
+Julie,Smith,Bill,,

diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
index 210a085cdb1fa920cf22c43de27e157f0cfd5031..2cdf6d492ebcbe12c1d00708adbac5c54daf2ae3 100644 (file)
--- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
@@ -334,6 +334,11 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
     $this->assertEquals('IMPORTED', $row['_status']);
     $row = $dataSource->getRow();
     $this->assertEquals('IMPORTED', $row['_status']);
+    $row = $dataSource->getRow();
+    $this->assertEquals('IMPORTED', $row['_status']);
+    $row = $dataSource->getRow();
+    // currently Error with the message (Dad to) Missing required fields: Last Name OR Email Address OR External Identifier
+    // $this->assertEquals('IMPORTED', $row['_status']);
   }
 
   /**