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

Merged in gproly/processmaker/HOR-1649 (pull request #4793)

Browse Source 
HOR-1649
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-19 18:01:09 -04:00
parent 4b168ed30c 91aea18c16
commit bfe86525f1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,7 +350,7 @@ class Light
* Execute Trigger case
*
*/
public function doExecuteTriggerCase($usr_uid, $prj_uid, $act_uid, $cas_uid, $step_uid, $type)
public function doExecuteTriggerCase($usr_uid, $prj_uid, $act_uid, $cas_uid, $step_uid, $type, $del_index = null)
{
$userData = $this->getUserData($usr_uid);
$c = new \Criteria();
@@ -373,7 +373,7 @@ class Light
$_SESSION["TASK"] = $act_uid;
$_SESSION["USER_LOGGED"] = $usr_uid;
$_SESSION["USR_USERNAME"] = $userData['firstName'];
$_SESSION["INDEX"] = $Fields["DEL_INDEX"] = \AppDelegation::getCurrentIndex($cas_uid);
$_SESSION["INDEX"] = $Fields["DEL_INDEX"] = $del_index !== null ? $del_index : \AppDelegation::getCurrentIndex($cas_uid);
$Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], G::getSystemConstants() );
$triggers = $oCase->loadTriggers( $act_uid, 'DYNAFORM', $step_uid_obj, strtoupper($type) );
if($triggers){

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

@@ -1670,7 +1670,7 @@ class Light extends Api
//trigger before
$oMobile = new \ProcessMaker\BusinessModel\Light();
$triggers = $oMobile->doExecuteTriggerCase($usr_uid, $pro_uid, $act_uid, $app_uid, $step_uid, "before");
$triggers = $oMobile->doExecuteTriggerCase($usr_uid, $pro_uid, $act_uid, $app_uid, $step_uid, "before", $app_index);
if ($triggers["status"] === "ok") {
$triggers["status"] = "200";
}