Merged in mcuiza/processmaker/PM-3740-A (pull request #2959)

PM-3740-A
This commit is contained in:
Julio Cesar Laura Avendaño
2015-10-13 18:52:09 -04:00
2 changed files with 7 additions and 1 deletions

View File

@@ -207,6 +207,7 @@ try {
}
$_SESSION['PROCESS'] = $aFields['PRO_UID'];
$_SESSION['TASK'] = - 1;
$_SESSION['bNoShowSteps'] = 1;
//$Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] );
if ($_action == 'jump') {
$Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], 1);

View File

@@ -108,6 +108,11 @@ if(!isset($_SESSION['APPLICATION']) || !isset($_SESSION['TASK']) || !isset($_SES
$_SESSION['TASK'] = $case['TAS_UID'];
$_SESSION['INDEX'] = $case['DEL_INDEX'];
}
$_SESSION['TASK'] = $_GET['action'] == "unassigned" ? -1 : $_SESSION['TASK'];
$_SESSION['TASK'] = ($_GET['action'] == "unassigned" || $_GET['action'] == "sent" ) ? -1 : $_SESSION['TASK'];
if($_GET['action'] == "todo" || $_GET['action'] == "draft") {
if (isset($_SESSION['bNoShowSteps'])) {
unset($_SESSION['bNoShowSteps']);
}
}
G::RenderPage( 'publish', 'extJs' );