Remove jsSet & just construct the if better.
authoreileen <emcnaughton@wikimedia.org>
Thu, 5 Sep 2019 02:35:22 +0000 (14:35 +1200)
committereileen <emcnaughton@wikimedia.org>
Thu, 5 Sep 2019 03:21:54 +0000 (15:21 +1200)
jsSet is always TRUE when if ([] != ts('- do not import -')) {

so we don't need it

CRM/Contact/Import/Form/MapField.php

index 0b445d84575693f71b38d59f941e161f32358c63..81bb8ef4557941c6a394cb57106dd15254cf23b3 100644 (file)
@@ -866,19 +866,14 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
         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;
         }
       }
       else {
         $defaults["mapper[$i]"] = [];
-      }
-      if (!$jsSet) {
         for ($k = 1; $k < 4; $k++) {
           $js .= "{$formName}['mapper[$i][$k]'].style.display = 'none';\n";
         }