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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-12112

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-07-09 10:01:32 -04:00
parent af34ed842b 1568bed499
commit be4aef8fbd
8 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/classes/class.wsBase.php
View File

@@ -1814,6 +1814,10 @@ class wsBase
$arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "BEFORE", $arrayField["APP_DATA"]);
$arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "AFTER", $arrayField["APP_DATA"]);
unset($arrayField['APP_STATUS']);
unset($arrayField['APP_PROC_STATUS']);
unset($arrayField['APP_PROC_CODE']);
unset($arrayField['APP_PIN']);
$arrayField = $oCase->updateCase($caseId, $arrayField);
}
}
@@ -2068,6 +2072,10 @@ class wsBase
//$appFields = $oCase->loadCase( $caseId );
$appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
$oCase->updateCase( $caseId, $appFields );
}
}
@@ -2115,6 +2123,10 @@ class wsBase
$varTriggers .= "&nbsp;- " . nl2br( htmlentities( $oTrigger->getTriTitle(), ENT_QUOTES ) ) . "<br/>";
//$appFields = $oCase->loadCase( $caseId );
$appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
$oCase->updateCase( $caseId, $appFields );
}
@@ -2241,6 +2253,10 @@ class wsBase
$appFields['APP_DATA'] = $oPMScript->aFields;
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
//$appFields = $oCase->loadCase($caseId);
unset($aFields['APP_STATUS']);
unset($aFields['APP_PROC_STATUS']);
unset($aFields['APP_PROC_CODE']);
unset($aFields['APP_PIN']);
$oCase->updateCase( $caseId, $appFields );
}
}
@@ -2441,6 +2457,10 @@ class wsBase
//Save data - Start
$appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']);
unset($appFields['APP_PROC_STATUS']);
unset($appFields['APP_PROC_CODE']);
unset($appFields['APP_PIN']);
//$appFields = $oCase->loadCase($caseId);
$oCase->updateCase( $caseId, $appFields );
//Save data - End