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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
jennylee
2012-10-30 11:36:35 -04:00
parent 093558e1d0 473d6cc8d8
commit ace86a1790
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
workflow/engine/methods/cases/casesListExtJsRedirector.php
View File

@@ -24,5 +24,3 @@ if (isset( $_GET['ux'] )) {
?> ?>
} }
</script> </script>
<?php