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

Merged in bugfix/HOR-4862 (pull request #6619)

Browse Source 
HOR-4862

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Dante Loayza <dante.loayza@colosa.com>
Approved-by: David Callizaya <david.callizaya@processmaker.com>
This commit is contained in:
Paula Quispe
2018-09-06 20:59:17 +00:00
parent 0871080117 22e712c2c6
commit 4b632795cd
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
workflow/engine/classes/class.pmFunctions.php
View File

@@ -2767,27 +2767,26 @@ function PMFDeleteCase ($caseUid)
* @return int | $result | Result of the cancelation | Returns 1 if the case is cancel successfully; otherwise, returns 0 if an error occurred.
*
*/
function PMFCancelCase ($caseUid, $delIndex = null, $userUid = null)
function PMFCancelCase($caseUid, $delIndex = null, $userUid = null)
{
$ws = new WsBase();
$result = $ws->cancelCase($caseUid, $delIndex, $userUid);
$result = (object)$result;
$sessionAppUid = $_SESSION['APPLICATION'];
if ($result->status_code == 0) {
if (isset($_SESSION['APPLICATION']) && isset($_SESSION['INDEX'])) {
if ($_SESSION['APPLICATION'] == $caseUid && $_SESSION['INDEX'] == $delIndex) {
if (!defined('WEB_SERVICE_VERSION')) {
G::header('Location: ../cases/casesListExtJsRedirector');
die();
} else {
die(
G::LoadTranslation(
//It was cancelled the same case in the execution
if ($sessionAppUid === $caseUid) {
if (!defined('WEB_SERVICE_VERSION')) {
G::header('Location: ../cases/casesListExtJsRedirector');
die;
} else {
die(
G::LoadTranslation(
'ID_PM_FUNCTION_CHANGE_CASE',
SYS_LANG,
['PMFCancelCase', G::LoadTranslation('ID_CANCELLED')]
)
);
}
['PMFCancelCase', G::LoadTranslation('ID_CANCELLED')]
)
);
}
}