diff --git a/workflow/engine/methods/cases/cases_OpenToRevise.php b/workflow/engine/methods/cases/cases_OpenToRevise.php index ac920d716..f33b10fe2 100755 --- a/workflow/engine/methods/cases/cases_OpenToRevise.php +++ b/workflow/engine/methods/cases/cases_OpenToRevise.php @@ -70,7 +70,7 @@ $_SESSION['TASK'] = $aFields['TAS_UID']; $_SESSION['STEP_POSITION'] = 0; /* Redirect to next step */ -$aNextStep = $oCase->getNextSupervisorStep( $_SESSION['PROCESS'], 0 ); +$aNextStep = $oCase->getNextSupervisorStep( $_SESSION['PROCESS'], 1); if($aNextStep['UID'] != ''){ $sPage = "cases_StepToRevise?type=DYNAFORM&PRO_UID=" . $aFields['PRO_UID'] . "&DYN_UID=" . $aNextStep['UID'] . "&APP_UID=$sAppUid&DEL_INDEX=$iDelIndex&position=1"; //$aNextStep['PAGE']; G::header( 'location: ' . $sPage ); diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index d9d07645d..2f9455f87 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -101,5 +101,13 @@ $oHeadPublisher->assign( '_APP_UID', $_GET['APP_UID']); $oHeadPublisher->assign( '_ENV_CURRENT_DATE', $conf->getSystemDate( date( 'Y-m-d' ) ) ); $oHeadPublisher->assign( '_ENV_CURRENT_DATE_NO_FORMAT', date( 'Y-m-d-h-i-A' ) ); $oHeadPublisher->assign( 'idfirstform', is_null( $oStep ) ? '' : $oStep->getStepUidObj() ); +$oHeadPublisher->assign( 'appStatus', $case['APP_STATUS'] ); + +if(!isset($_SESSION['APPLICATION']) || !isset($_SESSION['TASK']) || !isset($_SESSION['INDEX'])) { + $_SESSION['APPLICATION'] = $case['APP_UID']; + $_SESSION['TASK'] = $case['TAS_UID']; + $_SESSION['INDEX'] = $case['DEL_INDEX']; +} + G::RenderPage( 'publish', 'extJs' ); diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 6292f2ee1..19d56414b 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -458,6 +458,9 @@ Ext.onReady(function(){ Ext.getCmp('actionMenu').hide(); hideCaseNavigatorPanel(); + if(typeof appStatus !== "undefined") { + showCaseNavigatorPanel(appStatus); + } // Actions methods