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

Merged in gproly/processmaker/HOR-1881 (pull request #4934)

Browse Source 
HOR-1881
This commit is contained in:
Julio Cesar Laura Avendaño
2016-09-20 14:31:03 -04:00
parent 0cfd484e67 80fb171bb6
commit 1ad5b87e7f
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,8 @@ if (isset( $_GET['ux'] )) {
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
} else if( $statusPMGmail ){ } else if( $statusPMGmail ){
$url = $pathDerivateGmail; $uex = isset($_GET['uex']) ? '?uex=' . $_GET['uex'] : '';
$url = $pathDerivateGmail . $uex;
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
} else { } else {
$url = 'casesListExtJs'; $url = 'casesListExtJs';

3
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -256,7 +256,8 @@ try {
$aNextStep ['PAGE'] = $casesRedirector . '?ux=' . $_SESSION ['user_experience']; $aNextStep ['PAGE'] = $casesRedirector . '?ux=' . $_SESSION ['user_experience'];
$debuggerAvailable = false; $debuggerAvailable = false;
} else if ($flagGmail === true) { } 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 { } else {
$aNextStep ['PAGE'] = $casesRedirector; $aNextStep ['PAGE'] = $casesRedirector;
} }

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

@@ -28,7 +28,7 @@ if(array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle-
unset($_SESSION['gmail']); //cleaning session unset($_SESSION['gmail']); //cleaning session
$mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent'; $mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
} else{ } else{
$mUrl = 'casesListExtJs'; $mUrl = isset($_GET['uex']) ? '../home' : 'casesListExtJs';
} }
header( 'location:' . $mUrl ); header( 'location:' . $mUrl );