fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source 
Fix some issues with the process definition imports.
This commit is contained in:
Gustavo Cruz
2016-04-01 17:54:19 -04:00
parent 2e09e4721f 69cb9add73
commit 2783d0498f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,11 +62,11 @@ class GranularImporter
break; break;
case 'ASSIGNMENTRULES': case 'ASSIGNMENTRULES':
$objectList['ASSIGNMENTRULES']['tasks'] = isset($data['tables']['workflow']['tasks']) ? $objectList['ASSIGNMENTRULES']['tasks'] = isset($data['tables']['workflow']['tasks']) ?
$data['tables']['workflow']['tasks'] : ''; $data['tables']['workflow']['tasks'] : [];
$objectList['ASSIGNMENTRULES']['taskusers'] = isset($data['tables']['workflow']['taskusers']) ? $objectList['ASSIGNMENTRULES']['taskusers'] = isset($data['tables']['workflow']['taskusers']) ?
$data['tables']['workflow']['taskusers'] : ''; $data['tables']['workflow']['taskusers'] : [];
$objectList['ASSIGNMENTRULES']['groupwfs'] = isset($data['tables']['workflow']['groupwfs']) ? $objectList['ASSIGNMENTRULES']['groupwfs'] = isset($data['tables']['workflow']['groupwfs']) ?
$data['tables']['workflow']['groupwfs'] : ''; $data['tables']['workflow']['groupwfs'] : [];
break; break;
case 'VARIABLES': case 'VARIABLES':
$objectList['VARIABLES'] = isset($data['tables']['workflow']['processVariables']) ? $objectList['VARIABLES'] = isset($data['tables']['workflow']['processVariables']) ?

4
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php
View File

@@ -38,7 +38,7 @@ class ProcessDefinitionMigrator implements Importable, Exportable
$pjrUid =$this->bpmn->createFromStruct($data['bpmn'], false); $pjrUid =$this->bpmn->createFromStruct($data['bpmn'], false);
//Workflow elements //Workflow elements
$this->processes->createTaskRows($data['workflow']['tasks']); $this->processes->createTaskRows($data['workflow']['tasks']);
$this->processes->createTaskUserRows($data['workflow']['taskUsers']); $this->processes->createTaskUserRows($data['workflow']['taskusers']);
$this->processes->createRouteRows($data['workflow']['routes']); $this->processes->createRouteRows($data['workflow']['routes']);
$this->processes->createLaneRows($data['workflow']['lanes']); $this->processes->createLaneRows($data['workflow']['lanes']);
$this->processes->createGatewayRows($data['workflow']['gateways']); $this->processes->createGatewayRows($data['workflow']['gateways']);
@@ -105,7 +105,7 @@ class ProcessDefinitionMigrator implements Importable, Exportable
$oData = new \StdClass(); $oData = new \StdClass();
$oData->tasks = $this->processes->getTaskRows($prj_uid); $oData->tasks = $this->processes->getTaskRows($prj_uid);
$oData->taskUsers = $this->processes->getTaskUserRows($oData->tasks); $oData->taskusers = $this->processes->getTaskUserRows($oData->tasks);
$oData->routes = $this->processes->getRouteRows($prj_uid); $oData->routes = $this->processes->getRouteRows($prj_uid);
$oData->lanes = $this->processes->getLaneRows($prj_uid); $oData->lanes = $this->processes->getLaneRows($prj_uid);
$oData->gateways = $this->processes->getGatewayRows($prj_uid); $oData->gateways = $this->processes->getGatewayRows($prj_uid);