From 2599f48cede9fd681d8d959f6fe3b84132e8d887 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Mon, 10 Apr 2017 11:38:30 -0400 Subject: [PATCH] HOR-1799 Trigger Wizard: Si se dejan en blanco algunos campos no requeridos los triggers no funcionan correctamente --- workflow/engine/classes/class.pmFunctions.php | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index c608d430b..f48eaaf88 100644 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -2540,7 +2540,7 @@ function PMFRedirectToStep ($sApplicationUID, $iDelegation, $sStepType, $sStepUi * @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'; @@ -2551,33 +2551,34 @@ function PMFGetNextAssignedUser ($application, $task, $delIndex = null, $userUid require_once 'classes/model/GroupUser.php'; $oTask = new Task(); - $TaskFields = $oTask->load( $task ); + $TaskFields = $oTask->load($task); $typeTask = $TaskFields['TAS_ASSIGN_TYPE']; $g = new G(); $g->sessionVarSave(); - $_SESSION['INDEX'] = (!is_null($delIndex) ? $delIndex : (isset($_SESSION['INDEX']) ? $_SESSION['INDEX'] : null)); - $_SESSION['USER_LOGGED'] = (!is_null($userUid) ? $userUid : (isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null)); + $_SESSION['INDEX'] = (!empty($delIndex) ? $delIndex : (isset($_SESSION['INDEX']) ? $_SESSION['INDEX'] : 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'])) { - G::LoadClass( 'derivation' ); + G::LoadClass('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) { - $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; } $g->sessionVarRestore(); - if (count( $aUsers ) == 1) { + if (count($aUsers) == 1) { return $aUser; } else { return $aUsers; @@ -3279,10 +3280,10 @@ function PMFGetDynaformUID($dynaFormName, $processUid = null) 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 (!empty($arrayResult))? array_shift($arrayResult) : false; + return (!empty($arrayResult)) ? array_shift($arrayResult) : false; } /** @@ -3347,7 +3348,8 @@ function PMFGetTaskUID($taskName, $processUid = null) $criteria->addSelectColumn(TaskPeer::TAS_UID); $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->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -3359,7 +3361,7 @@ function PMFGetTaskUID($taskName, $processUid = null) } //Return - return ($taskUid != '')? $taskUid : false; + return ($taskUid != '') ? $taskUid : false; } /** @@ -3501,15 +3503,14 @@ function PMFCaseLink($caseUid, $workspace = null, $language = null, $skin = null if ($arrayApplicationData === false) { return false; } - - $workspace = (!is_null($workspace))? $workspace : SYS_SYS; - $language = (!is_null($language))? $language : SYS_LANG; - $skin = (!is_null($skin))? $skin : SYS_SKIN; + $workspace = (!empty($workspace)) ? $workspace : SYS_SYS; + $language = (!empty($language)) ? $language : SYS_LANG; + $skin = (!empty($skin)) ? $skin : SYS_SKIN; $uri = '/sys' . $workspace . '/' . $language . '/' . $skin . '/cases/opencase/' . $caseUid; //Return - return ((G::is_https())? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $uri; + return ((G::is_https()) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $uri; } catch (Exception $e) { throw $e; } @@ -3707,7 +3708,7 @@ function PMFCopyDocumentCase($appDocUid, $versionNumber, $targetCaseUid, $inputD "APP_UID" => $targetCaseUid, "DEL_INDEX" => $dataFields['DEL_INDEX'], "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_CREATE_DATE" => date("Y-m-d H:i:s"), "APP_DOC_COMMENT" => $dataFields['APP_DOC_COMMENT'],