fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in mcuiza/processmaker/PM-1492 (pull request #1483)

Browse Source 
PM-1492 (0016511 - 16515: Conditions)
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-19 16:12:13 -04:00
parent 7460aa107f 647e754200
commit 8ae62cbb2a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.derivation.php
View File

@@ -195,7 +195,11 @@ class Derivation
$pmScript = new PMScript(); $pmScript = new PMScript();
$pmScript->setFields($arrayApplicationData["APP_DATA"]); $pmScript->setFields($arrayApplicationData["APP_DATA"]);
if(preg_match('/\b(or|and|xor)\b/i' , $arrayRouteData["ROU_CONDITION"])) {
$pmScript->setScript("( ".$arrayRouteData["ROU_CONDITION"]." )");
} else {
$pmScript->setScript($arrayRouteData["ROU_CONDITION"]); $pmScript->setScript($arrayRouteData["ROU_CONDITION"]);
}
$flagContinue = $pmScript->evaluate(); $flagContinue = $pmScript->evaluate();
} }