fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/HOR-2071 (pull request #5028)

Browse Source 
HOR-2071
This commit is contained in:
Paula Quispe
2016-10-26 22:07:49 +00:00
parent e8d1773f1c 368fa86b88
commit edbe88a628
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -97,6 +97,7 @@ class Light
$newForm[$c]['stepId'] = $form["step_uid"]; $newForm[$c]['stepId'] = $form["step_uid"];
$newForm[$c]['stepUidObj'] = $form["step_uid_obj"]; $newForm[$c]['stepUidObj'] = $form["step_uid_obj"];
$newForm[$c]['stepMode'] = $form['step_mode']; $newForm[$c]['stepMode'] = $form['step_mode'];
$newForm[$c]['stepCondition'] = $form['step_condition'];
$newForm[$c]['stepPosition'] = $form['step_position']; $newForm[$c]['stepPosition'] = $form['step_position'];
$trigger = $this->statusTriggers($step->doGetActivityStepTriggers($form["step_uid"], $tempTreeChild['taskId'], $tempTreeChild['processId'])); $trigger = $this->statusTriggers($step->doGetActivityStepTriggers($form["step_uid"], $tempTreeChild['taskId'], $tempTreeChild['processId']));
$newForm[$c]["triggers"] = $trigger; $newForm[$c]["triggers"] = $trigger;

1
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -849,6 +849,7 @@ class Light extends Api
$result['stepId'] = $activitySteps[$i]["step_uid"]; $result['stepId'] = $activitySteps[$i]["step_uid"];
$result['stepUidObj'] = $activitySteps[$i]["step_uid_obj"]; $result['stepUidObj'] = $activitySteps[$i]["step_uid_obj"];
$result['stepMode'] = $activitySteps[$i]['step_mode']; $result['stepMode'] = $activitySteps[$i]['step_mode'];
$result['stepCondition'] = $activitySteps[$i]['step_condition'];
$result['stepPosition'] = $activitySteps[$i]['step_position']; $result['stepPosition'] = $activitySteps[$i]['step_position'];
$trigger = $oMobile->statusTriggers($step->doGetActivityStepTriggers($activitySteps[$i]["step_uid"], $act_uid, $prj_uid)); $trigger = $oMobile->statusTriggers($step->doGetActivityStepTriggers($activitySteps[$i]["step_uid"], $act_uid, $prj_uid));
$result["triggers"] = $trigger; $result["triggers"] = $trigger;