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

Merged in dheeyi/processmaker/HOR-2446 (pull request #5274)

Browse Source 
HOR-2446
This commit is contained in:
Julio Cesar Laura Avendaño
2016-12-23 15:40:12 -04:00
parent 1122b44594 bbd608d82d
commit b264f56ef6
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,9 +298,9 @@ class GranularImporter
}
/**
* @param $objectList
* @param array $data
* @return data
* @param $data
* @param bool $generateUid
* @return array
* @throws \Exception
*/
public function regenerateAllUids($data, $generateUid = true)
@@ -312,7 +312,7 @@ class GranularImporter
$arrayWorkflowFiles = $data["files"]["workflow"];
$result = $this->bpmn->createFromStruct($this->structureBpmnData($arrayBpmnTables), $generateUid);
$projectUidOld = $arrayBpmnTables["project"][0]["prj_uid"];
$projectUid = ($generateUid)? $result[0]["new_uid"] : $result;
$projectUid = ($generateUid) ? $result[0]["new_uid"] : $result;
if ($generateUid) {
$result[0]["object"] = "project";
$result[0]["old_uid"] = $projectUidOld;
@@ -323,7 +323,7 @@ class GranularImporter
list($arrayWorkflowTables, $arrayWorkflowFiles) = $workflow->updateDataUidByArrayUid($arrayWorkflowTables, $arrayWorkflowFiles, $result);
}
$newData['tables']['workflow'] = $arrayWorkflowTables;
$newData['tables']['plugins'] = $data["tables"]["plugins"];
$newData['tables']['plugins'] = isset($data["tables"]["plugins"]) ? $data["tables"]["plugins"] : [];
$newData['files']['workflow'] = $arrayWorkflowFiles;
return array(