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

HOR-2785

Browse Source
This commit is contained in:
Dante
2017-03-03 10:20:59 -04:00
parent 86445b8626
commit 5a777c23af
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ class Derivation
$arrayNextTaskData = $value; $arrayNextTaskData = $value;
$this->node[$value['TAS_UID']]['out'][$value['ROU_NEXT_TASK']] = $value['ROU_TYPE']; $this->node[$value['TAS_UID']]['out'][$value['ROU_NEXT_TASK']] = $value['ROU_TYPE'];
if ($arrayNextTaskData["NEXT_TASK"]["TAS_UID"] != "-1" && if ($arrayNextTaskData["NEXT_TASK"]["TAS_UID"] != "-1" &&
preg_match("/^(?:" . $this->regexpTaskTypeToInclude . ")$/", $arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"]) preg_match("/^(?:GATEWAYTOGATEWAY)$/", $arrayNextTaskData["NEXT_TASK"]["TAS_TYPE"])
) { ) {
$arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]); $arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]);
$this->node[$value['ROU_NEXT_TASK']]['in'][$value['TAS_UID']] = $value['ROU_TYPE']; $this->node[$value['ROU_NEXT_TASK']]['in'][$value['TAS_UID']] = $value['ROU_TYPE'];

14
workflow/engine/methods/cases/cases_Step.php
View File

@@ -1112,6 +1112,20 @@ try {
$aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TITLE"] = G::LoadTranslation("ID_ROUTE_TO_TASK_INTERMEDIATE_CATCH_MESSAGE_EVENT"); $aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TITLE"] = G::LoadTranslation("ID_ROUTE_TO_TASK_INTERMEDIATE_CATCH_MESSAGE_EVENT");
} }
//in the case of an end event (message or mail) we need to show the end of process data in the
//routing screen.
if ( array_key_exists("TASK", $aFields)
&& array_key_exists("1", $aFields["TASK"])
&& array_key_exists("NEXT_TASK", $aFields["TASK"]["1"])
&& array_key_exists("TAS_TYPE", $aFields["TASK"]["1"]["NEXT_TASK"])
&& preg_match("/^(?:END-MESSAGE-EVENT|END-EMAIL-EVENT)$/", $aFields["TASK"]["1"]["NEXT_TASK"]["TAS_TYPE"])
) {
$aFields["TASK"]["1"]["NEXT_TASK"]["TAS_TITLE"] = G::LoadTranslation( 'ID_END_OF_PROCESS' );
$aFields["TASK"]["1"]["NEXT_TASK"]["USR_UID"] = " ";
$aFields["TASK"]["1"]["NEXT_TASK"]["USR_HIDDEN_FIELD"] = $_SESSION["USR_FULLNAME"];
}
$G_PUBLISH->AddContent( 'smarty', $tplFile, '', '', $aFields ); $G_PUBLISH->AddContent( 'smarty', $tplFile, '', '', $aFields );
/* /*
if (isset( $aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){ if (isset( $aFields['TASK'][1]['NEXT_TASK']['USER_ASSIGNED'])){