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

HOR-2778

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-02-23 16:47:44 -04:00
parent 541e5d67ca
commit e4aea533c0
1 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,36 +574,15 @@ class Variable
$cnn = \Propel::getConnection($dbConnection); $cnn = \Propel::getConnection($dbConnection);
$stmt = $cnn->createStatement(); $stmt = $cnn->createStatement();
if (isset($arrayVariable['app_uid']) && !empty($arrayVariable['app_uid'])) { if (isset($arrayVariable['app_uid']) && !empty($arrayVariable['app_uid'])) {
$delIndex = isset($arrayVariable["del_index"]) ? $arrayVariable["del_index"] : 0; $delIndex = isset($arrayVariable["del_index"]) ? $arrayVariable["del_index"] : 0;
$case = new \Cases(); $case = new \Cases();
$fields = $case->loadCase($arrayVariable['app_uid'], (int) $delIndex); $fields = $case->loadCase($arrayVariable['app_uid'], (int) $delIndex);
$arrayVariable = array_merge($fields['APP_DATA'], $arrayVariable); $arrayVariable = array_merge($fields['APP_DATA'], \ProcessMaker\BusinessModel\Cases::getGlobalVariables($fields['APP_DATA']));
//Set the global variables
if (!isset($arrayVariable['APPLICATION']) || empty($arrayVariable['APPLICATION'])) {
$arrayVariable['APPLICATION'] = $arrayVariable['app_uid'];
}
if (!isset($arrayVariable['PROCESS']) || empty($arrayVariable['PROCESS'])) {
$arrayVariable['PROCESS'] = $fields['PRO_UID'];
}
if (isset($fields['TASK']) && !empty($fields['TASK'])) {
$arrayVariable['TASK'] = $fields['TASK'];
}
if (isset($fields['INDEX']) && !empty($fields['INDEX'])) {
$arrayVariable['INDEX'] = $fields['INDEX'];
}
$arrayVariable['USER_LOGGED'] = \ProcessMaker\Services\OAuth2\Server::getUserId();
if (isset($arrayVariable['USER_LOGGED']) && !empty($arrayVariable['USER_LOGGED'])) {
$oUserLogged = new \Users();
$oUserLogged->load($arrayVariable['USER_LOGGED']);
$arrayVariable['USR_USERNAME'] = $oUserLogged->getUsrUsername();
}
} }
$replaceFields = G::replaceDataField($variableSql, $arrayVariable); $sql = G::replaceDataField($variableSql, $arrayVariable);
$rs = $stmt->executeQuery($replaceFields, \ResultSet::FETCHMODE_NUM); $rs = $stmt->executeQuery($sql, \ResultSet::FETCHMODE_NUM);
while ($rs->next()) { while ($rs->next()) {
$row = $rs->getRow(); $row = $rs->getRow();
@@ -742,6 +721,8 @@ class Variable
$fields = $case->getApplicationRecordByPk($arrayVariable['app_uid'], ['$applicationUid' => 'app_uid']); $fields = $case->getApplicationRecordByPk($arrayVariable['app_uid'], ['$applicationUid' => 'app_uid']);
$case = new \Cases(); $case = new \Cases();
$appData = $case->unserializeData($fields['APP_DATA']); $appData = $case->unserializeData($fields['APP_DATA']);
$appData = array_merge($appData, \ProcessMaker\BusinessModel\Cases::getGlobalVariables($appData));
$arrayVariable = array_merge($appData, $arrayVariable);
} }
$_SESSION["PROCESS"] = $processUid; $_SESSION["PROCESS"] = $processUid;
\G::LoadClass("pmDynaform"); \G::LoadClass("pmDynaform");