fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in zeitmaster/processmaker/MT-10 (pull request #4039)

Browse Source 
MT-85
This commit is contained in:
Gustavo Cruz
2016-04-02 11:06:22 -04:00
parent 2783d0498f 92fadecf9b
commit d03c08ffab
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
View File

@@ -182,16 +182,13 @@ class GranularImporter
* @return bool * @return bool
* @throws \Exception * @throws \Exception
*/ */
public function validateImportData($objectList, $generateUid = false) public function validateImportData($objectList)
{ {
try { try {
if (count($objectList) !== count($this->exportObjects->getObjectsList())) {
if ($generateUid) { $exception = new ImportException();
if (count($objectList) !== count($this->exportObjects->getObjectsList())) { $exception->setNameException(\G::LoadTranslation('ID_PROCESS_DEFINITION_INCOMPLETE'));
$exception = new ImportException(); throw($exception);
$exception->setNameException(\G::LoadTranslation('ID_PROCESS_DEFINITION_INCOMPLETE'));
throw($exception);
}
} }
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {

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

@@ -234,7 +234,7 @@ abstract class Importer
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter(); $granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$newObjectArray = $objectsToImport; $newObjectArray = $objectsToImport;
$projectUid = $this->importData['tables']['bpmn']["project"][0]["prj_uid"]; $projectUid = $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
$processGranulate = $granularObj->validateImportData($objectsToImport, $generateUid); $processGranulate = $granularObj->validateImportData($objectsToImport);
if($generateUid){ if($generateUid){
$result = $granularObj->regenerateAllUids($this->importData, $generateUid); $result = $granularObj->regenerateAllUids($this->importData, $generateUid);
$this->importData = $result['data']; $this->importData = $result['data'];