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

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

Browse Source 
MT-83
This commit is contained in:
Gustavo Cruz
2016-04-01 17:14:11 -04:00
parent d567ad7b6e f8e4973456
commit 82dabdc866
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,10 +74,10 @@ class AssignmentRulesMigrator implements Importable, Exportable
{
try {
$oAssignRules = new \StdClass();
$oAssignRulesTasks = $this->processes->getTaskRows($prj_uid);
$oAssignRules->taskusers = $this->processes->getTaskUserRows($oAssignRulesTasks);
$oAssignRules->tasks = $this->processes->getTaskRows($prj_uid);
$oAssignRules->taskusers = $this->processes->getTaskUserRows($oAssignRules->tasks);
//groups - task
$oDataTaskUsers = $this->processes->getTaskUserRows($oAssignRulesTasks);
$oDataTaskUsers = $this->processes->getTaskUserRows($oAssignRules->tasks);
$oAssignRules->groupwfs = $this->processes->getGroupwfRows($oDataTaskUsers);
$result = array(

3
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);
//Workflow elements
$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->createLaneRows($data['workflow']['lanes']);
$this->processes->createGatewayRows($data['workflow']['gateways']);
@@ -105,6 +105,7 @@ class ProcessDefinitionMigrator implements Importable, Exportable
$oData = new \StdClass();
$oData->tasks = $this->processes->getTaskRows($prj_uid);
$oData->taskUsers = $this->processes->getTaskUserRows($oData->tasks);
$oData->routes = $this->processes->getRouteRows($prj_uid);
$oData->lanes = $this->processes->getLaneRows($prj_uid);
$oData->gateways = $this->processes->getGatewayRows($prj_uid);