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

Merged in paulis/processmaker/MT-12-B (pull request #3922)

Browse Source 
MT-12
This commit is contained in:
Gustavo Cruz
2016-03-23 15:55:32 -04:00
parent 209f7a3f7f e56b3af527
commit 9400ecc204
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,19 +65,12 @@ class AssignmentRulesMigrator implements Importable, Exportable
public function export($prj_uid)
{
try {
$oData = new \StdClass();
$oData->process = $this->processes->getProcessRow($prj_uid, false);
$oData->tasks = $this->processes->getTaskRows($prj_uid);
$oData->routes = $this->processes->getRouteRows($prj_uid);
$oData->lanes = $this->processes->getLaneRows($prj_uid);
$oData->gateways = $this->processes->getGatewayRows($prj_uid);
$oData->steps = $this->processes->getStepRows($prj_uid);
$oData->triggers = $this->processes->getTriggerRows($prj_uid);
$assignmentData = new \StdClass();
$assignmentData->taskusers = $this->processes->getTaskUserRows($oData->tasks);
$oAssignRules = new \StdClass();
$oAssignRules->tasks = $this->processes->getTaskRows($prj_uid);
$oAssignRules->taskusers = $this->processes->getTaskUserRows($oAssignRules->tasks);
$result = array(
'workflow-definition' => (array)$assignmentData
'workflow-definition' => (array)$oAssignRules
);
return $result;

2
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TriggersMigrator.php
View File

@@ -65,7 +65,7 @@ class TriggersMigrator implements Importable, Exportable
try {
$oData = new \StdClass();
$oDataTasks = $this->processes->getTaskRows($prj_uid);
$oData->triggers = $this->processes->getTriggerRows($oDataTasks);
$oData->triggers = $this->processes->getTriggerRows($prj_uid);
$oData->steptriggers = $this->processes->getStepTriggerRows($oDataTasks);
$result = array(