fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/HOR-3216 (pull request #5671)

Browse Source 
HOR-3216

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Jonathan Quispe
2017-05-18 20:25:28 +00:00
committed by Julio Cesar Laura Avendaño
parent 7226be9c54 9e561c75df
commit a6cca66ced
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/class.applications.php
View File

@@ -70,6 +70,7 @@ class Applications
APP_DELEGATION.DEL_DELAYED,
APP_DELEGATION.DEL_DELAY_DURATION,
TASK.TAS_TITLE AS APP_TAS_TITLE,
TASK.TAS_TYPE AS APP_TAS_TYPE,
USERS.USR_LASTNAME,
USERS.USR_FIRSTNAME,
USERS.USR_USERNAME,

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

@@ -1462,7 +1462,7 @@ class Derivation
$appFields['PRO_UID'],
$currentDelegation['APP_UID'],
$nextDel['TAS_UID'],
(isset( $nextDel['USR_UID'] ) ? $nextDel['USR_UID'] : ''),
$this->verifyCurrentUserInTask($nextDel, $aSP),
$currentDelegation['DEL_INDEX'],
$nextDel['DEL_PRIORITY'],
$delType,
@@ -1645,6 +1645,22 @@ class Derivation
return $iNewDelIndex;
}
/**
* This function returns the current user Checking cases where USR_ID exists or checking a subprocess (SYNCHRONOUS)
* @param $nextDel
* @param null $aSP
* @return string
*/
function verifyCurrentUserInTask($nextDel, $aSP = null)
{
if (isset($aSP) && $aSP["SP_SYNCHRONOUS"] == "1") {
$currentUser = "";
} else {
$currentUser = isset($nextDel['USR_UID']) ? $nextDel['USR_UID'] : "";
}
return $currentUser;
}
/**
* This function create, update and closed a new record related to appThread
*