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

HOR-1654 "Error: when you open a case in Participated when is a Dummy Task" SOLVED

Browse Source 
Issue:
    Error: when you open a case in Participated when is a Dummy Task
Cause:
    Caracter "-" es utilizado en la funcion "explode"
Solution:
    Se cambia el caracter "-" por "|"
This commit is contained in:
Victor Saisa Lopez
2016-08-22 14:09:23 -04:00
parent cc6380fb4a
commit bfd4e45fc9
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.case.php
View File

@@ -559,10 +559,11 @@ class Cases
foreach ($aCases as $key => $value) {
$oCurUser->load($value['USR_UID']);
$aFields['CURRENT_USER'][]= $oCurUser->getUsrFirstname() . ' ' . $oCurUser->getUsrLastname();
$aFields['TAS_UID'].= $value['TAS_UID'].'-';
$aFields['TAS_UID'] .= (($aFields['TAS_UID'] != '')? '|' : '') . $value['TAS_UID'];
}
$aFields['CURRENT_USER'] = implode(" - ", array_values($aFields['CURRENT_USER']));
$tasksArray = array_filter(explode("-",$aFields['TAS_UID']));
$tasksArray = array_filter(explode('|', $aFields['TAS_UID']));
if(count($tasksArray) == 1) {
$aFields['TAS_UID'] = $tasksArray[0];
}

5
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -225,16 +225,18 @@ class Ajax
if ($_SESSION["TASK"] != "" && $_SESSION["TASK"] != "-1") {
$oTask = new Task();
$tasksInParallel = explode("-", $_SESSION['TASK']);
$tasksInParallel = explode('|', $_SESSION['TASK']);
$tasksInParallel = array_filter($tasksInParallel, function($value) {
return !empty($value);
});
$nTasksInParallel = count($tasksInParallel);
if ($nTasksInParallel > 1) {
$aTask = $oTask->load($tasksInParallel[$nTasksInParallel - 1]);
} else {
$aTask = $oTask->load($_SESSION['TASK']);
}
if ($aTask['TAS_TYPE'] == 'ADHOC') {
$options[] = Array('text' => G::LoadTranslation('ID_ADHOC_ASSIGNMENT'), 'fn' => 'adhocAssignmentUsers');
}
@@ -1034,4 +1036,3 @@ $action = $_REQUEST['action'];
unset($_REQUEST['action']);
$ajax->$action($_REQUEST);

9
workflow/engine/methods/cases/cases_Resume.php
View File

@@ -114,22 +114,23 @@ $objProc = new Process();
$aProc = $objProc->load( $Fields['PRO_UID'] );
$Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
$objTask = new Task();
if(!isset($Fields['TAS_UID']) || $Fields['TAS_UID'] == '') {
$Fields['TAS_UID'] = $Fields['APP_DATA']['TASK'];
}
$tasksInParallel = explode("-", $Fields['TAS_UID']);
$tasksInParallel = explode('|', $Fields['TAS_UID']);
$tasksInParallel = array_filter($tasksInParallel, function($value) {
return !empty($value);
});
$nTasksInParallel = count($tasksInParallel);
if ($nTasksInParallel > 1) {
$aTask = $objTask->load($tasksInParallel[$nTasksInParallel - 1]);
} else {
$aTask = $objTask->load($Fields['TAS_UID']);
}
$Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
$objUser = new Users();
@@ -164,5 +165,5 @@ if($Fields['APP_STATUS'] != 'COMPLETED'){
}
}
G::RenderPage( 'publish', 'blank' );
G::RenderPage('publish', 'blank');

4
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -863,12 +863,14 @@ class Light
$objTask = new \Task();
if (isset($_SESSION['ACTION']) && ($_SESSION['ACTION'] == 'jump')) {
$task = explode('-', $Fields['TAS_UID']);
$task = explode('|', $Fields['TAS_UID']);
$Fields['TAS_TITLE'] = '';
for( $i = 0; $i < sizeof($task)-1; $i ++ ) {
$aTask = $objTask->load( $task[$i] );
$Fields['TAS_TITLE'][] = $aTask['TAS_TITLE'];
}
$Fields['TAS_TITLE'] = implode(" - ", array_values($Fields['TAS_TITLE']));
} else {
$aTask = $objTask->load( $Fields['TAS_UID'] );