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

Merged in gproly/processmaker/PM-4210 (pull request #3334)

Browse Source 
PM-4210
This commit is contained in:
Julio Cesar Laura Avendaño
2015-12-08 12:54:29 -04:00
parent 1e73ff2c5d cc9a696aa4
commit c25d70ee99
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -564,6 +564,32 @@ class PMScript
}
}
}
if (isset($this->aFields[$var]) && is_string($this->aFields[$var])) {
$varInfo = $variableModule->getVariableTypeByName($_SESSION['PROCESS'], $var);
$options = G::json_decode($varInfo["VAR_ACCEPTED_VALUES"]);
$no = count($options);
for ($io = 0; $io < $no; $io++) {
if ($options[$io]->value === $this->aFields[$var]) {
$this->aFields[$var . "_label"] = $options[$io]->label;
}
}
if ($varInfo["VAR_DBCONNECTION"] !== "" && $varInfo["VAR_DBCONNECTION"] !== "none" && $varInfo["VAR_SQL"] !== "") {
try {
$cnn = Propel::getConnection($varInfo["VAR_DBCONNECTION"]);
$stmt = $cnn->createStatement();
$sql = G::replaceDataField($varInfo["VAR_SQL"], $this->aFields);
$rs = $stmt->executeQuery($sql, \ResultSet::FETCHMODE_NUM);
while ($rs->next()) {
$row = $rs->getRow();
if ($row[0] === $this->aFields[$var]) {
$this->aFields[$var . "_label"] = isset($row[1]) ? $row[1] : $row[0];
}
}
} catch (Exception $e) {
}
}
}
}
}
}

3
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -880,6 +880,9 @@ class Variable
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DBCONNECTION);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_SQL);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES);
$criteria->add(\ProcessVariablesPeer::VAR_NAME, $variableName);
$criteria->add(\ProcessVariablesPeer::PRJ_UID, $processUid);
$rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria);