BUG 9946 Cases paused with the PMFPauseCase function are redirecting to the inbox and Paused folder at the same time SOLVED

- The triggers was paused the current case
- Add validation when the trigger pause/cancel the current case
This commit is contained in:
Julio Cesar Laura
2012-10-29 15:24:21 -04:00
parent 1a8a53ba09
commit e07093203b
2 changed files with 23 additions and 5 deletions

View File

@@ -2281,6 +2281,16 @@ function PMFCancelCase ($caseUid, $delIndex, $userUid)
$result = $ws->cancelCase( $caseUid, $delIndex, $userUid );
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(__('ID_PM_FUNCTION_CHANGE_CASE', SYS_LANG, array('PMFCancelCase', G::LoadTranslation('ID_CANCELLED'))));
}
}
}
return 1;
} else {
return 0;
@@ -2303,12 +2313,22 @@ function PMFCancelCase ($caseUid, $delIndex, $userUid)
*/
function PMFPauseCase ($caseUid, $delIndex, $userUid, $unpauseDate = null)
{
G::LoadClass( "wsBase" );
G::LoadClass('wsBase');
$ws = new wsBase();
$result = $ws->pauseCase( $caseUid, $delIndex, $userUid, $unpauseDate );
$result = $ws->pauseCase($caseUid, $delIndex, $userUid, $unpauseDate);
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(__('ID_PM_FUNCTION_CHANGE_CASE', SYS_LANG, array('PMFPauseCase', G::LoadTranslation('ID_PAUSED'))));
}
}
}
return 1;
} else {
return 0;

View File

@@ -23,6 +23,4 @@ if (isset( $_GET['ux'] )) {
}
?>
}
</script>
<?php
</script>