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

Merged in paulis/processmaker/HOR-1269 (pull request #4603)

Browse Source 
HOR-1269
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-21 15:14:05 -04:00
parent 5992319d1d 69f26135ae
commit d10980ceae
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,6 +268,9 @@ abstract class Importer
if (sizeof($objectList) > 0 && $processGranulate) { if (sizeof($objectList) > 0 && $processGranulate) {
$granularObj->import($objectList); $granularObj->import($objectList);
} }
$project = new \ProcessMaker\Project\Adapter\BpmnWorkflow();
$diagram = $project->getStruct($projectUid);
$res = $project->updateFromStruct($projectUid, $diagram);
} }
return $projectUid; return $projectUid;
@@ -533,7 +536,19 @@ abstract class Importer
foreach ($arrayWorkflowTables["tasks"] as $key => $value) { foreach ($arrayWorkflowTables["tasks"] as $key => $value) {
$arrayTaskData = $value; $arrayTaskData = $value;
if (!in_array($arrayTaskData["TAS_TYPE"], array("GATEWAYTOGATEWAY", "WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT", "START-TIMER-EVENT", "INTERMEDIATE-CATCH-TIMER-EVENT", "END-EMAIL-EVENT", "INTERMEDIATE-THROW-EMAIL-EVENT"))) { if (!in_array($arrayTaskData["TAS_TYPE"], array(
"GATEWAYTOGATEWAY",
"WEBENTRYEVENT",
"END-MESSAGE-EVENT",
"START-MESSAGE-EVENT",
"INTERMEDIATE-THROW-MESSAGE-EVENT",
"INTERMEDIATE-CATCH-MESSAGE-EVENT",
"START-TIMER-EVENT",
"INTERMEDIATE-CATCH-TIMER-EVENT",
"END-EMAIL-EVENT",
"INTERMEDIATE-THROW-EMAIL-EVENT"
))
) {
$result = $workflow->updateTask($arrayTaskData["TAS_UID"], $arrayTaskData); $result = $workflow->updateTask($arrayTaskData["TAS_UID"], $arrayTaskData);
} }
} }