From 10716b266c13990e26391ead44dd4298a5aabeaa Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 22 Apr 2022 09:48:28 +1200
Subject: [PATCH] [REF] [Import] Ensure jobID is set in contact flow

---
 CRM/Contact/Import/Form/Preview.php | 1 +
 CRM/Contact/Import/ImportJob.php    | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index b65467c144..420b3694a8 100644
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -232,6 +232,7 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
       'statusFieldName' => $this->get('statusFieldName'),
       'statusID' => $this->get('statusID'),
       'totalRowCount' => $this->get('totalRowCount'),
+      'userJobID' => $this->getUserJobID(),
     );
 
     $tableName = $this->get('importTableName');
diff --git a/CRM/Contact/Import/ImportJob.php b/CRM/Contact/Import/ImportJob.php
index 838ee5ce83..61833e089e 100644
--- a/CRM/Contact/Import/ImportJob.php
+++ b/CRM/Contact/Import/ImportJob.php
@@ -43,8 +43,13 @@ class CRM_Contact_Import_ImportJob {
   protected $_mapperKeys = [];
   protected $_mapFields;
 
+  /**
+   * @var CRM_Contact_Import_Parser_Contact
+   */
   protected $_parser;
 
+  protected $_userJobID;
+
   /**
    * @param string|null $tableName
    * @param string|null $createSql
@@ -218,7 +223,7 @@ class CRM_Contact_Import_ImportJob {
       $parserParameters['mapperWebsiteType'],
       $parserParameters['relatedContactWebsiteType']
     );
-
+    $this->_parser->setUserJobID($this->_userJobID);
     $this->_parser->run($this->_tableName, $mapperFields,
       CRM_Import_Parser::MODE_IMPORT,
       $this->_contactType,
-- 
2.25.1