Merge pull request #15219 from eileenmcnaughton/import_next

[Ref] [Import] more code cleanup
civicrm · Sep 5, 2019 · 802b6da · 802b6da
2 parents 283c0da + d2d3b4e
commit 802b6da
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
@@ -858,27 +858,14 @@ protected function saveMappingField($mapperKeys, array $saveMapping, string $cTy
    * @throws \CiviCRM_API3_Exception
    */
   public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $hasColumnNames, $dataPatterns, $columnPatterns) {
-    $jsSet = FALSE;
     $formName = $processor->getFormName();
     if (isset($mappingName[$i])) {
       if ($mappingName[$i] != ts('- do not import -')) {
-
-        if ($processor->getRelationshipKey($i)) {
-          $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
-          $js = $processor->getQuickFormJSForField($i);
-          $jsSet = TRUE;
-        }
-        else {
-          $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
-          $js .= $processor->getQuickFormJSForField($i);
-
-          $jsSet = TRUE;
-        }
+        $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
+        $js .= $processor->getQuickFormJSForField($i);
       }
       else {
         $defaults["mapper[$i]"] = [];
-      }
-      if (!$jsSet) {
         for ($k = 1; $k < 4; $k++) {
           $js .= "{$formName}['mapper[$i][$k]'].style.display = 'none';\n";
         }