[REF] Import - generate js on the processor class

[civicrm-core.git] / CRM / Contact / Import / Form / MapField.php

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index da428dd6bd02adae962743a13df65dd6d023b3c8..58423b71a8a34c3ee66ab6eafe6a897ba38855c7 100644 (file)
--- 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;
         }