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

Merged in gproly/processmaker/HOR-1457-B (pull request #4644)

Browse Source 
HOR-1457-B
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-29 12:13:29 -04:00
parent 314307c04f 1339c6e753
commit c8d9dc0989
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,16 @@ class Ajax
if ($_SESSION["TASK"] != "" && $_SESSION["TASK"] != "-1") { if ($_SESSION["TASK"] != "" && $_SESSION["TASK"] != "-1") {
$oTask = new Task(); $oTask = new Task();
$aTask = $oTask->load($_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') { if ($aTask['TAS_TYPE'] == 'ADHOC') {
$options[] = Array('text' => G::LoadTranslation('ID_ADHOC_ASSIGNMENT'), 'fn' => 'adhocAssignmentUsers'); $options[] = Array('text' => G::LoadTranslation('ID_ADHOC_ASSIGNMENT'), 'fn' => 'adhocAssignmentUsers');
} }

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

@@ -120,7 +120,16 @@ $objTask = new Task();
if(!isset($Fields['TAS_UID']) || $Fields['TAS_UID'] == '') { if(!isset($Fields['TAS_UID']) || $Fields['TAS_UID'] == '') {
$Fields['TAS_UID'] = $Fields['APP_DATA']['TASK']; $Fields['TAS_UID'] = $Fields['APP_DATA']['TASK'];
} }
$aTask = $objTask->load( $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']; $Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
$objUser = new Users(); $objUser = new Users();