Merge pull request #15189 from eileenmcnaughton/import_tiny

[Import][ref] Minor code improvement - move setDefaults to processor
civicrm · Sep 4, 2019 · 1f84e94 · 1f84e94
2 parents 6e80fe5 + df90a4d
commit 1f84e94
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
@@ -914,19 +914,7 @@ public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $
           $jsSet = TRUE;
         }
         else {
-          $mappingHeader = $processor->getFieldName($i);
-          $websiteTypeId = $processor->getWebsiteTypeID($i);
-          $locationId = $processor->getLocationTypeID($i);
-          $typeId = $processor->getPhoneOrIMTypeID($i);
-
-          if ($websiteTypeId) {
-            $defaults["mapper[$i]"] = [$mappingHeader, $websiteTypeId];
-          }
-          else {
-            //default for IM/phone without related contact
-            $defaults["mapper[$i]"] = [$mappingHeader ?? '', $locationId, $typeId];
-          }
-
+          $defaults["mapper[$i]"] = $processor->getSavedQuickformDefaultsForColumn($i);
           $js .= $processor->getQuickFormJSForField($i);
 
           $jsSet = TRUE;

diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php
@@ -504,4 +504,19 @@ public function getQuickFormJSForField($column) {
     return implode("\n", $jsClauses) . "\n";
   }
 
+  /**
+   * Get the defaults for the column from the saved mapping.
+   *
+   * @param int $column
+   *
+   * @return array
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function getSavedQuickformDefaultsForColumn($column) {
+    if ($this->getWebsiteTypeID($column)) {
+      return [$this->getFieldName($column), $this->getWebsiteTypeID($column)];
+    }
+    return [(string) $this->getFieldName($column), $this->getLocationTypeID($column), $this->getPhoneOrIMTypeID($column)];
+  }
+
 }