fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in mcuiza/processmaker/pm_1492 (pull request #1498)

Browse Source 
PM-1492 (Las condiciones no funcionan correctamente)
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-20 14:20:37 -04:00
parent e0812f6386 605c22c101
commit 8526bb85b2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,11 +195,7 @@ class Derivation
$pmScript = new PMScript();
$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();
}

3
workflow/engine/classes/class.pmScript.php
View File

@@ -491,6 +491,9 @@ class PMScript
}
}
$sScript .= substr( $this->sScript, $iAux );
if(preg_match('/\b(or|and|xor)\b/i' , $sScript)) {
$sScript = "( ".$sScript." )";
}
$sScript = '$bResult = ' . $sScript . ';';
// checks if the syntax is valid or if the variables in that condition has been previously defined
if ($this->validSyntax( $sScript ) && $variableIsDefined) {