fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in dheeyi/processmaker/MT-10 (pull request #4034)

Browse Source 
MT-10
This commit is contained in:
Gustavo Cruz
2016-04-01 17:35:59 -04:00
parent 82dabdc866 37323ba75c
commit 2e09e4721f
3 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -171,8 +171,11 @@ abstract class Importer
break;
case self::IMPORT_OPTION_OVERWRITE:
//Shouldn't generate new UID for all objects
/*----------------------------------********---------------------------------*/
if($objectsToImport === ''){
/*----------------------------------********---------------------------------*/
$this->removeProject();
/*----------------------------------********---------------------------------*/
} else {
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$objectList = $granularObj->loadObjectsListSelected($this->importData, $objectsToImport);
@@ -189,6 +192,7 @@ abstract class Importer
throw $exception;
}
}
/*----------------------------------********---------------------------------*/
$name = $this->currentProcessTitle;
$generateUid = false;
break;
@@ -223,7 +227,7 @@ abstract class Importer
if(!empty($generateUidFromJs)) {
$generateUid = $generateUidFromJs;
}
/*----------------------------------********---------------------------------*/
//Granular Import
try {
if ($objectsToImport !== '') {
@@ -255,7 +259,7 @@ abstract class Importer
} catch (\Exception $e) {
throw $e;
}
/*----------------------------------********---------------------------------*/
$result = $this->doImport($generateUid);