From fc14cac0cefcd48ed336b597b7c4e133f038995c Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 25 Oct 2023 11:05:37 +1100 Subject: [PATCH] dev/core#4726 Ensure that quickform mapper default value is set correctly for do_not_import fields in saved mappings on import Fix test failure --- CRM/Import/ImportProcessor.php | 5 ----- tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php index fbbe9d85ee..4938dff9b7 100644 --- a/CRM/Import/ImportProcessor.php +++ b/CRM/Import/ImportProcessor.php @@ -583,11 +583,6 @@ class CRM_Import_ImportProcessor { public function getSavedQuickformDefaultsForColumn($column) { $fieldMapping = []; - // $sel1 is either unmapped, a relationship or a target field. - if ($this->getFieldName($column) === 'do_not_import') { - return $fieldMapping; - } - if ($this->getValidRelationshipKey($column)) { $fieldMapping[] = $this->getValidRelationshipKey($column); } diff --git a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php index 7e7e72495f..7af3de10c9 100644 --- a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php +++ b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php @@ -261,7 +261,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase { [ ['name' => 'do_not_import', 'contact_type' => 'Individual', 'column_number' => 0], "swapOptions(document.forms.MapField, 'mapper[0]', 0, 4, 'hs_mapper_0_');\n", - ['mapper[0]' => []], + ['mapper[0]' => ['do_not_import']], ], ]; } -- 2.25.1