diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php index e99c7f2e9..e20e2b5ec 100644 --- a/workflow/engine/methods/cases/casesListExtJsRedirector.php +++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php @@ -30,21 +30,37 @@ if (isset($_GET['ux'])) { if (isset($_GET['ux'])) { echo 'if (typeof window.parent.ux_env != \'undefined\') {'; } -echo ' parent.parent.postMessage("redirect=todo","*");'; +/*----------------------------------********---------------------------------*/ +if (true) { + echo ' parent.parent.postMessage("redirect=todo","*");'; +} else { +/*----------------------------------********---------------------------------*/ + echo " window.parent.location.href = '$url';"; +/*----------------------------------********---------------------------------*/ +} +/*----------------------------------********---------------------------------*/ if (isset($_GET['ux'])) { /*----------------------------------********---------------------------------*/ if (PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail) { echo '} else { window.parent.location.href = \''.$pathDerivateGmail.'\'; }'; } else { + /*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/ - echo '} else { - if (parent.parent.postMessage) { - parent.parent.postMessage("redirect=todo","*"); - } else { - window.parent.location.href = \'casesListExtJs\'; - } - }'; + if (true) { + echo '} else { + if (parent.parent.postMessage) { + parent.parent.postMessage("redirect=todo","*"); + } else { + window.parent.location.href = \'casesListExtJs\'; + } + }'; + } else { /*----------------------------------********---------------------------------*/ + echo '} else { window.parent.location.href = \'casesListExtJs\'; }'; + /*----------------------------------********---------------------------------*/ + } + /*----------------------------------********---------------------------------*/ + /*----------------------------------********---------------------------------*/ } /*----------------------------------********---------------------------------*/ } diff --git a/workflow/engine/templates/cases/cases_Load.php b/workflow/engine/templates/cases/cases_Load.php index 331418685..59f382be0 100644 --- a/workflow/engine/templates/cases/cases_Load.php +++ b/workflow/engine/templates/cases/cases_Load.php @@ -14,9 +14,27 @@ $filter = new InputFilter(); }
+ + + +