Merge pull request #17697 from MegaphoneJon/multi-record-import-fix

Multi record import screen fix
civicrm · Jun 26, 2020 · ec96d34 · ec96d34
2 parents a5e01e6 + a55b3c0
commit ec96d34
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
@@ -151,6 +151,7 @@ public static function getCreateMappingValues($mappingType) {
         civicrm_api3('OptionValue', 'create', [
           'option_group_id' => 'mapping_type',
           'label' => $mappingType,
+          'name' => $mappingType,
           'value' => max(array_keys($mappingValues['values'])) + 1,
           'is_reserved' => 1,
         ]);

diff --git a/tests/phpunit/CRM/Core/BAO/MappingTest.php b/tests/phpunit/CRM/Core/BAO/MappingTest.php
@@ -219,4 +219,11 @@ public function getMappingMaps() {
     ];
   }
 
+  /**
+   * Ensure getCreateMappingValues() doesn't return an error when there are spaces in the name.
+   */
+  public function testGetCreateMappingValues() {
+    CRM_Core_BAO_Mapping::getCreateMappingValues("Import Multi value custom data");
+  }
+
 }