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

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

@@ -2543,7 +2543,7 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi
* @return array | $array | List of users | Return a list of users * @return array | $array | List of users | Return a list of users
* *
*/ */
function PMFGetNextAssignedUser ($application, $task, $delIndex = null, $userUid = null) function PMFGetNextAssignedUser($application, $task, $delIndex = null, $userUid = null)
{ {
require_once 'classes/model/AppDelegation.php'; require_once 'classes/model/AppDelegation.php';
@@ -2554,33 +2554,34 @@ function PMFGetNextAssignedUser ($application, $task, $delIndex = null, $userUid
require_once 'classes/model/GroupUser.php'; require_once 'classes/model/GroupUser.php';
$oTask = new Task(); $oTask = new Task();
$TaskFields = $oTask->load( $task ); $TaskFields = $oTask->load($task);
$typeTask = $TaskFields['TAS_ASSIGN_TYPE']; $typeTask = $TaskFields['TAS_ASSIGN_TYPE'];
$g = new G(); $g = new G();
$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'])) {
G::LoadClass( 'derivation' ); G::LoadClass('derivation');
$oDerivation = new Derivation(); $oDerivation = new Derivation();
$aDeriv = $oDerivation->prepareInformation( array ('USER_UID' => $_SESSION['USER_LOGGED'],'APP_UID' => $application,'DEL_INDEX' => $_SESSION['INDEX'] $aDeriv = $oDerivation->prepareInformation(array('USER_UID' => $_SESSION['USER_LOGGED'], 'APP_UID' => $application, 'DEL_INDEX' => $_SESSION['INDEX']
) ); ));
foreach ($aDeriv as $derivation) { foreach ($aDeriv as $derivation) {
$aUser = array ('USR_UID' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_UID'],'USR_USERNAME' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'],'USR_FIRSTNAME' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_FIRSTNAME'],'USR_LASTNAME' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_LASTNAME'],'USR_EMAIL' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_EMAIL'] $aUser = array('USR_UID' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_UID'], 'USR_USERNAME' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_USERNAME'], 'USR_FIRSTNAME' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_FIRSTNAME'], 'USR_LASTNAME' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_LASTNAME'], 'USR_EMAIL' => $derivation['NEXT_TASK']['USER_ASSIGNED']['USR_EMAIL']
); );
$aUsers[] = $aUser; $aUsers[] = $aUser;
} }
$g->sessionVarRestore(); $g->sessionVarRestore();
if (count( $aUsers ) == 1) { if (count($aUsers) == 1) {
return $aUser; return $aUser;
} else { } else {
return $aUsers; return $aUsers;
@@ -3282,10 +3283,10 @@ 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);
@@ -3362,7 +3364,7 @@ function PMFGetTaskUID($taskName, $processUid = null)
} }
//Return //Return
return ($taskUid != '')? $taskUid : false; return ($taskUid != '') ? $taskUid : false;
} }
/** /**
@@ -3504,15 +3506,14 @@ 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;
//Return //Return
return ((G::is_https())? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $uri; return ((G::is_https()) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $uri;
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
} }
@@ -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'],