diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php index 3948f5987..d0297d63b 100644 --- a/workflow/engine/methods/cases/casesListExtJsRedirector.php +++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php @@ -23,7 +23,8 @@ if (isset( $_GET['ux'] )) { } /*----------------------------------********---------------------------------*/ } else if( $statusPMGmail ){ - $url = $pathDerivateGmail; + $uex = isset($_GET['uex']) ? '?uex=' . $_GET['uex'] : ''; + $url = $pathDerivateGmail . $uex; /*----------------------------------********---------------------------------*/ } else { $url = 'casesListExtJs'; diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php index 9aa0772e6..8b531ab19 100644 --- a/workflow/engine/methods/cases/cases_Derivate.php +++ b/workflow/engine/methods/cases/cases_Derivate.php @@ -256,7 +256,8 @@ try { $aNextStep ['PAGE'] = $casesRedirector . '?ux=' . $_SESSION ['user_experience']; $debuggerAvailable = false; } else if ($flagGmail === true) { - $aNextStep ['PAGE'] = $casesRedirector . '?gmail=1'; + $ux = isset($_SESSION ['user_experience']) ? '&uex=' . $_SESSION ['user_experience'] : ''; + $aNextStep ['PAGE'] = $casesRedirector . '?gmail=1' . $ux; } else { $aNextStep ['PAGE'] = $casesRedirector; } diff --git a/workflow/engine/methods/cases/derivatedGmail.php b/workflow/engine/methods/cases/derivatedGmail.php index 8cef86cf0..76b30f121 100644 --- a/workflow/engine/methods/cases/derivatedGmail.php +++ b/workflow/engine/methods/cases/derivatedGmail.php @@ -28,7 +28,7 @@ if(array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle- unset($_SESSION['gmail']); //cleaning session $mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent'; } else{ - $mUrl = 'casesListExtJs'; + $mUrl = isset($_GET['uex']) ? '../home' : 'casesListExtJs'; } header( 'location:' . $mUrl );