X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FImport%2FForm%2FMapField.php;h=58423b71a8a34c3ee66ab6eafe6a897ba38855c7;hb=3c23826507d740d79ea52a6a26fc6cea526b4632;hp=da428dd6bd02adae962743a13df65dd6d023b3c8;hpb=04d254c7db1962096018cbde69ded6f637be5d16;p=civicrm-core.git

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index da428dd6bd..58423b71a8 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -914,29 +914,20 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
           $jsSet = TRUE;
         }
         else {
-          $mappingHeader = array_keys((array) $this->_mapperFields, $mappingName[$i]);
+          $mappingHeader = $processor->getFieldName($i);
           $websiteTypeId = $processor->getWebsiteTypeID($i);
           $locationId = $processor->getLocationTypeID($i);
-          $phoneType = $processor->getPhoneTypeID($i);
-          $imProvider = $processor->getIMProviderID($i);
           $typeId = $processor->getPhoneOrIMTypeID($i);
 
           if ($websiteTypeId) {
-            $defaults["mapper[$i]"] = [$mappingHeader[0], $websiteTypeId];
+            $defaults["mapper[$i]"] = [$mappingHeader, $websiteTypeId];
           }
           else {
-            if (!$locationId) {
-              $js .= "{$formName}['mapper[$i][1]'].style.display = 'none';\n";
-            }
             //default for IM/phone without related contact
-            $defaults["mapper[$i]"] = [$mappingHeader[0] ?? '', $locationId, $typeId];
-          }
-
-          if ((!$phoneType) && (!$imProvider)) {
-            $js .= "{$formName}['mapper[$i][2]'].style.display = 'none';\n";
+            $defaults["mapper[$i]"] = [$mappingHeader ?? '', $locationId, $typeId];
           }
 
-          $js .= "{$formName}['mapper[$i][3]'].style.display = 'none';\n";
+          $js .= $processor->getQuickFormJSForField($i);
 
           $jsSet = TRUE;
         }