fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-4440

Browse Source
This commit is contained in:
Paula Quispe
2018-03-22 09:43:19 -04:00
parent 1c2c7d69cd
commit 9a42249df8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/methods/cases/main_init.php
View File

@@ -63,11 +63,13 @@ if (isset( $arrayConfig["DEFAULT_CASES_MENU"] )) {
} }
if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) { if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
$openAppUid = $_SESSION['__OPEN_APPLICATION_UID__'];
unset($_SESSION['__OPEN_APPLICATION_UID__']);
$case = new \ProcessMaker\BusinessModel\Cases(); $case = new \ProcessMaker\BusinessModel\Cases();
$confDefaultOption = 'CASES_SEARCH'; $confDefaultOption = 'CASES_SEARCH';
$action = 'search'; $action = 'search';
$arrayResult = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__'], 0, $_SESSION['USER_LOGGED']); $arrayResult = $case->getStatusInfo($openAppUid, 0, $_SESSION['USER_LOGGED']);
$arrayDelIndex = []; $arrayDelIndex = [];
if (!empty($arrayResult)) { if (!empty($arrayResult)) {
@@ -86,7 +88,7 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
$arrayDelIndex = $arrayResult['DEL_INDEX']; $arrayDelIndex = $arrayResult['DEL_INDEX'];
} else { } else {
$arrayResultData = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__']); $arrayResultData = $case->getStatusInfo($openAppUid);
$supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor(); $supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor();
$isSupervisor = $supervisor->isUserProcessSupervisor($arrayResultData['PRO_UID'], $_SESSION['USER_LOGGED']); $isSupervisor = $supervisor->isUserProcessSupervisor($arrayResultData['PRO_UID'], $_SESSION['USER_LOGGED']);
if ($isSupervisor) { if ($isSupervisor) {
@@ -94,9 +96,9 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
$arrayDelIndex = $arrayResultData['DEL_INDEX']; $arrayDelIndex = $arrayResultData['DEL_INDEX'];
} else { } else {
$_SESSION['PROCESS'] = $arrayResultData['PRO_UID']; $_SESSION['PROCESS'] = $arrayResultData['PRO_UID'];
$_GET['APP_UID'] = $_SESSION['__OPEN_APPLICATION_UID__']; $_GET['APP_UID'] = $openAppUid;
$_SESSION['ACTION'] = 'jump'; $_SESSION['ACTION'] = 'jump';
$_SESSION['APPLICATION'] = $_SESSION['__OPEN_APPLICATION_UID__']; $_SESSION['APPLICATION'] = $openAppUid;
$_SESSION['INDEX'] = $arrayResultData['DEL_INDEX'][0]; $_SESSION['INDEX'] = $arrayResultData['DEL_INDEX'][0];
require_once(PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php'); require_once(PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php');
exit(); exit();
@@ -104,14 +106,12 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
} }
if (count($arrayDelIndex) == 1) { if (count($arrayDelIndex) == 1) {
$defaultOption = '../cases/open?APP_UID=' . $_SESSION['__OPEN_APPLICATION_UID__'] . $defaultOption = '../cases/open?APP_UID=' . $openAppUid .
'&DEL_INDEX=' . $arrayDelIndex[0] . '&action=' . $action; '&DEL_INDEX=' . $arrayDelIndex[0] . '&action=' . $action;
} else { } else {
$defaultOption = '../cases/casesListExtJs?action=' . $action . $defaultOption = '../cases/casesListExtJs?action=' . $action .
'&openApplicationUid=' . $_SESSION['__OPEN_APPLICATION_UID__']; '&openApplicationUid=' . $openAppUid;
} }
unset($_SESSION['__OPEN_APPLICATION_UID__']);
} else { } else {
if (isset($_GET['id'])) { if (isset($_GET['id'])) {
$defaultOption = '../cases/open?APP_UID=' . $_GET['id'] . '&DEL_INDEX=' . $_GET['i']; $defaultOption = '../cases/open?APP_UID=' . $_GET['id'] . '&DEL_INDEX=' . $_GET['i'];