fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-2714

Browse Source
This commit is contained in:
Paula Quispe
2017-02-20 14:26:32 -04:00
parent 9843c3252d
commit 938c8ab5d5
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.case.php
View File

@@ -483,7 +483,6 @@ class Cases
try { try {
$oUser->load($oApp->getAppInitUser()); $oUser->load($oApp->getAppInitUser());
$uFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME); $uFields = $oUser->toArray(BasePeer::TYPE_FIELDNAME);
//$aFields['TITLE'] = $oApp->getAppTitle();
$aFields['TITLE'] = $aFields['APP_TITLE']; $aFields['TITLE'] = $aFields['APP_TITLE'];
$aFields['DESCRIPTION'] = $aFields['APP_DESCRIPTION']; $aFields['DESCRIPTION'] = $aFields['APP_DESCRIPTION'];
$aFields['CREATOR'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); $aFields['CREATOR'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
@@ -514,10 +513,10 @@ class Cases
$aFields['DEL_TASK_DUE_DATE'] = $aAppDel['DEL_TASK_DUE_DATE']; $aFields['DEL_TASK_DUE_DATE'] = $aAppDel['DEL_TASK_DUE_DATE'];
$aFields['DEL_FINISH_DATE'] = $aAppDel['DEL_FINISH_DATE']; $aFields['DEL_FINISH_DATE'] = $aAppDel['DEL_FINISH_DATE'];
$aFields['CURRENT_USER_UID'] = $aAppDel['USR_UID']; $aFields['CURRENT_USER_UID'] = $aAppDel['USR_UID'];
//Update the global variables
$aFields['TASK'] = $aAppDel['TAS_UID'];
$aFields['INDEX'] = $aAppDel['DEL_INDEX'];
try { try {
//$oCurUser = new Users();
//$oCurUser->load($aAppDel['USR_UID']);
//$aFields['CURRENT_USER'] = $oCurUser->getUsrFirstname() . ' ' . $oCurUser->getUsrLastname();
$oCurUser = new Users(); $oCurUser = new Users();
if ($jump != '') { if ($jump != '') {
$aCases = $oAppDel->LoadParallel($sAppUid); $aCases = $oAppDel->LoadParallel($sAppUid);

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

@@ -576,9 +576,30 @@ class Variable
$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;
$case = new \Cases(); $case = new \Cases();
$fields = $case->loadCase($arrayVariable['app_uid']); $fields = $case->loadCase($arrayVariable['app_uid'], (int) $delIndex);
$arrayVariable = array_merge($fields['APP_DATA'], $arrayVariable); $arrayVariable = array_merge($fields['APP_DATA'], $arrayVariable);
//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); $replaceFields = G::replaceDataField($variableSql, $arrayVariable);