feat(Import) Import_Launch_EventsAndWorkflows global variable

tsolucio · Jun 7, 2020 · 36f0fee · 36f0fee
1 parent 1430c55
commit 36f0fee
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 3 deletions.
diff --git a/build/changeSets/DefineGlobalVariables.php b/build/changeSets/DefineGlobalVariables.php
@@ -160,6 +160,7 @@ public function applyChange() {
 				'Import_Full_CSV',
 				'Import_Batch_Limit',
 				'Import_Scheduled_Limit',
+				'Import_Launch_EventsAndWorkflows',
 				'Export_Field_Separator_Symbol',
 				'Export_RelatedField_GetValueFrom',
 				'Export_RelatedField_NameForSearch',

diff --git a/cron/modules/Import/ScheduledImport.service b/cron/modules/Import/ScheduledImport.service
@@ -10,7 +10,6 @@
 
 global $VTIGER_BULK_SAVE_MODE;
 $previousBulkSaveMode = isset($VTIGER_BULK_SAVE_MODE) ? $VTIGER_BULK_SAVE_MODE : false;
-$VTIGER_BULK_SAVE_MODE = true;
 
 require_once 'modules/Import/controllers/Import_Data_Controller.php';
 Import_Data_Controller::runScheduledImport();

diff --git a/modules/GlobalVariable/language/en_us.gvdefs.php b/modules/GlobalVariable/language/en_us.gvdefs.php
@@ -475,6 +475,13 @@
 	'values' => '',
 	'definition' => 'Threshold import record limit for immediate import. If record count is more than this, then the import is scheduled through cron job. Default value is 1000',
 ),
+'Import_Launch_EventsAndWorkflows' => array(
+	'status' => 'Implemented',
+	'valuetype' => 'String',
+	'category' => 'Application',
+	'values' => 'yes | no',
+	'definition' => 'Launch events and workflows when importing records. Default value is no',
+),
 'Export_Field_Separator_Symbol' => array(
 	'status' => 'Implemented',
 	'valuetype' => 'character',

diff --git a/modules/GlobalVariable/language/es_es.gvdefs.php b/modules/GlobalVariable/language/es_es.gvdefs.php
@@ -476,6 +476,13 @@
 	'values' => '',
 	'definition' => 'Límite de registros que se pueden importar en línea. Si el número de registros a importar es mayor a este número, entonces la importación se realizará de manera desatendida por la tarea de programación correspondiente. El valor predeterminado es 1000',
 ),
+'Import_Launch_EventsAndWorkflows' => array(
+	'status' => 'Implementada',
+	'valuetype' => 'Texto',
+	'category' => 'Aplicación',
+	'values' => 'yes | no',
+	'definition' => 'Ejecutar eventos y flujos de trabajo al importar registros. El valor por defecto es no',
+),
 'Export_Field_Separator_Symbol' => array(
 	'status' => 'Implementada',
 	'valuetype' => 'carácter',

diff --git a/modules/GlobalVariable/language/fr_fr.gvdefs.php b/modules/GlobalVariable/language/fr_fr.gvdefs.php
@@ -475,6 +475,13 @@
 	'values' => '',
 	'definition' => 'Seuil limite du nombre d\'enregistrements à importer d\'un coup. Si le nombre d\'enregistrements est supéieur à ce seuil alors l\'importation est programmée sous forme de cron job. La valeur par défaut est (1000) enregistrements',
 ),
+'Import_Launch_EventsAndWorkflows' => array(
+	'status' => 'Implemented',
+	'valuetype' => 'String',
+	'category' => 'Application',
+	'values' => 'yes | no',
+	'definition' => 'Launch events and workflows when importing records. Default value is no',
+),
 'Export_Field_Separator_Symbol' => array(
 	'status' => 'Implemented',
 	'valuetype' => 'character',

diff --git a/modules/Import/controllers/Import_Data_Controller.php b/modules/Import/controllers/Import_Data_Controller.php
@@ -593,6 +593,7 @@ public function getImportStatusCount() {
 	}
 
 	public static function runScheduledImport() {
+		global $VTIGER_BULK_SAVE_MODE;
 		require_once 'modules/Emails/mail.php';
 		require_once 'modules/Emails/Emails.php';
 		global $current_user,$coreBOS_app_name;
@@ -604,6 +605,7 @@ public static function runScheduledImport() {
 		foreach ($scheduledImports as $importDataController) {
 			$current_user = $importDataController->user;
 			$importDataController->batchImport = false;
+			$VTIGER_BULK_SAVE_MODE = (GlobalVariable::getVariable('Import_Launch_EventsAndWorkflows', 'no', $importDataController->module)=='no'); //true;
 
 			if (!$importDataController->initializeImport()) {
 				continue;

diff --git a/modules/Import/index.php b/modules/Import/index.php
@@ -22,7 +22,7 @@
 	global $current_user, $VTIGER_BULK_SAVE_MODE;
 
 	$previousBulkSaveMode = isset($VTIGER_BULK_SAVE_MODE) ? $VTIGER_BULK_SAVE_MODE : false;
-	$VTIGER_BULK_SAVE_MODE = true;
+	$VTIGER_BULK_SAVE_MODE = (GlobalVariable::getVariable('Import_Launch_EventsAndWorkflows', 'no', $_REQUEST['module'])=='no'); //true;
 	$requestObject = new Import_API_Request($_REQUEST);
 	Import_Index_Controller::process($requestObject, $current_user);
 	$VTIGER_BULK_SAVE_MODE = $previousBulkSaveMode;

diff --git a/modules/cbMap/processmap/Import.php b/modules/cbMap/processmap/Import.php
@@ -371,10 +371,10 @@ private function doImportDirect($csvfile) {
 	private function doImportcoreBOS($arguments) {
 		global $current_user, $VTIGER_BULK_SAVE_MODE, $adb;
 		$previousBulkSaveMode = isset($VTIGER_BULK_SAVE_MODE) ? $VTIGER_BULK_SAVE_MODE : false;
-		$VTIGER_BULK_SAVE_MODE = true;
 		require_once 'modules/Import/api/Request.php';
 		include_once 'modules/Import/controllers/Import_Controller.php';
 		$rs = $adb->pquery('select module,field_mapping,defaultvalues from vtiger_import_maps where id=?', array($this->mapping['mapid']));
+		$VTIGER_BULK_SAVE_MODE = (GlobalVariable::getVariable('Import_Launch_EventsAndWorkflows', 'no', $rs->fields['module'])=='no'); //true;
 		$requestArray = array(
 			'module' => $rs->fields['module'],
 			'action' => 'Import',