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

Merged in bugfix/HOR-1799 (pull request #5601)

Browse Source 
HOR-1799

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
dheeyi william
2017-05-05 18:19:29 +00:00
committed by Julio Cesar Laura Avendaño
parent 0d5fe0328b 2599f48ced
commit 0e3a7c4131
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2561,8 +2561,9 @@ function PMFGetNextAssignedUser ($application, $task, $delIndex = null, $userUid
$g->sessionVarSave(); $g->sessionVarSave();
$_SESSION['INDEX'] = (!is_null($delIndex) ? $delIndex : (isset($_SESSION['INDEX']) ? $_SESSION['INDEX'] : null)); $_SESSION['INDEX'] = (!empty($delIndex) ? $delIndex : (isset($_SESSION['INDEX']) ? $_SESSION['INDEX'] : null));
$_SESSION['USER_LOGGED'] = (!is_null($userUid) ? $userUid : (isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null)); $_SESSION['USER_LOGGED'] = (!empty($userUid) ? $userUid : (isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED']
: null));
if ($typeTask == 'BALANCED' && !is_null($_SESSION['INDEX']) && !is_null($_SESSION['USER_LOGGED'])) { if ($typeTask == 'BALANCED' && !is_null($_SESSION['INDEX']) && !is_null($_SESSION['USER_LOGGED'])) {
@@ -3282,7 +3283,7 @@ function PMFGetDynaformUID($dynaFormName, $processUid = null)
return false; return false;
} }
$arrayResult = PMFGetUidFromText($dynaFormName, 'DYN_TITLE', (!is_null($processUid))? $processUid : $_SESSION['PROCESS']); $arrayResult = PMFGetUidFromText($dynaFormName, 'DYN_TITLE', (!empty($processUid)) ? $processUid : $_SESSION['PROCESS']);
//Return //Return
return (!empty($arrayResult)) ? array_shift($arrayResult) : false; return (!empty($arrayResult)) ? array_shift($arrayResult) : false;
@@ -3350,7 +3351,8 @@ function PMFGetTaskUID($taskName, $processUid = null)
$criteria->addSelectColumn(TaskPeer::TAS_UID); $criteria->addSelectColumn(TaskPeer::TAS_UID);
$criteria->add(TaskPeer::TAS_TITLE, $taskName, Criteria::EQUAL); $criteria->add(TaskPeer::TAS_TITLE, $taskName, Criteria::EQUAL);
$criteria->add(TaskPeer::PRO_UID, (!is_null($processUid))? $processUid : $_SESSION['PROCESS'], Criteria::EQUAL); $criteria->add(TaskPeer::PRO_UID, (!empty($processUid)) ? $processUid : $_SESSION['PROCESS'],
Criteria::EQUAL);
$rsCriteria = TaskPeer::doSelectRS($criteria); $rsCriteria = TaskPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -3504,10 +3506,9 @@ function PMFCaseLink($caseUid, $workspace = null, $language = null, $skin = null
if ($arrayApplicationData === false) { if ($arrayApplicationData === false) {
return false; return false;
} }
$workspace = (!empty($workspace)) ? $workspace : SYS_SYS;
$workspace = (!is_null($workspace))? $workspace : SYS_SYS; $language = (!empty($language)) ? $language : SYS_LANG;
$language = (!is_null($language))? $language : SYS_LANG; $skin = (!empty($skin)) ? $skin : SYS_SKIN;
$skin = (!is_null($skin))? $skin : SYS_SKIN;
$uri = '/sys' . $workspace . '/' . $language . '/' . $skin . '/cases/opencase/' . $caseUid; $uri = '/sys' . $workspace . '/' . $language . '/' . $skin . '/cases/opencase/' . $caseUid;
@@ -3710,7 +3711,7 @@ function PMFCopyDocumentCase($appDocUid, $versionNumber, $targetCaseUid, $inputD
"APP_UID" => $targetCaseUid, "APP_UID" => $targetCaseUid,
"DEL_INDEX" => $dataFields['DEL_INDEX'], "DEL_INDEX" => $dataFields['DEL_INDEX'],
"USR_UID" => $dataFields['USR_UID'], "USR_UID" => $dataFields['USR_UID'],
"DOC_UID" => ($inputDocumentUid != null) ? $inputDocumentUid : $dataFields['DOC_UID'], "DOC_UID" => (!empty($inputDocumentUid)) ? $inputDocumentUid : $dataFields['DOC_UID'],
"APP_DOC_TYPE" => $dataFields['APP_DOC_TYPE'], "APP_DOC_TYPE" => $dataFields['APP_DOC_TYPE'],
"APP_DOC_CREATE_DATE" => date("Y-m-d H:i:s"), "APP_DOC_CREATE_DATE" => date("Y-m-d H:i:s"),
"APP_DOC_COMMENT" => $dataFields['APP_DOC_COMMENT'], "APP_DOC_COMMENT" => $dataFields['APP_DOC_COMMENT'],