Move engagement level validation into the validate section

[civicrm-core.git] / CRM / Activity / Import / Parser / Activity.php

diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php
index 58fb50443bbc1822fdf5e3434e2aed3d03bb8fc5..7699d2ad01af01f0e5767581bd6e37954acdfb8c 100644 (file)
--- a/CRM/Activity/Import/Parser/Activity.php
+++ b/CRM/Activity/Import/Parser/Activity.php
@@ -148,6 +148,12 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser {
       && !$this->isValidDate($this->getFieldValue($values, 'activity_date_time'))) {
         throw new CRM_Core_Exception(ts('Invalid Activity Date'));
       }
+
+      if ($this->getFieldValue($values, 'activity_engagement_level')
+        && !CRM_Utils_Rule::positiveInteger($this->getFieldValue($values, 'activity_engagement_level'))) {
+        throw new CRM_Core_Exception(ts('Activity Engagement Index'));
+      }
+
     }
     catch (CRM_Core_Exception $e) {
       return $this->addError($values, [$e->getMessage()]);
@@ -157,13 +163,6 @@ class CRM_Activity_Import_Parser_Activity extends CRM_Activity_Import_Parser {
 
     $errorMessage = NULL;
 
-    foreach ($params as $key => $val) {
-      if ($key == 'activity_engagement_level' && $val &&
-        !CRM_Utils_Rule::positiveInteger($val)
-      ) {
-        CRM_Contact_Import_Parser_Contact::addToErrorMsg('Activity Engagement Index', $errorMessage);
-      }
-    }
     // Date-Format part ends.
 
     // Checking error in custom data.