From 312b8b424430da3075bff3f95991aaaec5d53f3f Mon Sep 17 00:00:00 2001 From: jennylee Date: Mon, 2 Sep 2013 17:45:37 -0400 Subject: [PATCH] BUG 11969 Web session TimeOut at HOME Se realizo una correccion de los direccionamientos de los iframes al perder sesion, ya q siempre q se perdia sesion antes, se mostraba dentro del mismo iframe el cuadro para volverse a logear, logrando asi q el usuario se mantenga en el mismo iframe una ves se relogee, sin tener asi q volver a buscar el lugar donde estaba trabajando. A pedido de QA, ahora se muestra el cuadro de logeo en el iframe mayor, totalmente fuera de PM, y siempre al volver a logearse se redirecciona al tab HOME > Index, y ya no asi al frame o lugar exacto donde se perdio sesion. Por ejemplo: si se pie sesion en el listado Draft, no se volvera a dicho listado, sino en cambio al volverse a logear se redireccionara a HOME > Indexdex. El cambio se aplico a los lugares donde se podia redireccionar al parent. Se tomo en cuenta tambien que algunos clientes utilizan el listado de casos dentro de sus propias webs. --- .../methods/cases/cases_CatchExecute.php | 10 +- .../engine/methods/cases/cases_SaveData.php | 10 +- workflow/engine/methods/cases/cases_Step.php | 10 +- workflow/engine/templates/app/main.js | 30 +++- .../engine/templates/cases/casesDocuments.js | 10 +- .../cases/casesGenerateDocumentPage.js | 20 ++- workflow/engine/templates/cases/casesList.js | 42 +++++- .../engine/templates/cases/casesStartCase.js | 60 +++++++- .../cases/casesUploadedDocumentsPage.js | 10 +- workflow/engine/templates/cases/open.js | 130 ++++++++++++++++-- 10 files changed, 298 insertions(+), 34 deletions(-) diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php index a970e2b83..82351fdb2 100755 --- a/workflow/engine/methods/cases/cases_CatchExecute.php +++ b/workflow/engine/methods/cases/cases_CatchExecute.php @@ -24,7 +24,15 @@ if (!isset($_SESSION['USER_LOGGED'])) { G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); die( ''); } /* Permissions */ diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index e711e0678..ac957d8e5 100755 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -25,7 +25,15 @@ if (!isset($_SESSION['USER_LOGGED'])) { G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); die( ''); } try { diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index b614b5948..7cdf58cfd 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -2,7 +2,15 @@ if (!isset($_SESSION['USER_LOGGED'])) { G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); die( ''); } /** diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js index 87ccaf80e..af560f7a9 100644 --- a/workflow/engine/templates/app/main.js +++ b/workflow/engine/templates/app/main.js @@ -79,7 +79,15 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid) icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } @@ -385,7 +393,15 @@ function sendNote() icon : Ext.MessageBox.ERROR, buttons : Ext.Msg.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -520,7 +536,15 @@ var openSummaryWindow = function(appUid, delIndex, action) icon : Ext.MessageBox.ERROR, buttons : Ext.Msg.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js index ef6a92f2b..3e85ca323 100755 --- a/workflow/engine/templates/cases/casesDocuments.js +++ b/workflow/engine/templates/cases/casesDocuments.js @@ -466,7 +466,15 @@ function openActionDialog(caller, action, dataAux) icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { diff --git a/workflow/engine/templates/cases/casesGenerateDocumentPage.js b/workflow/engine/templates/cases/casesGenerateDocumentPage.js index a0f4a6161..6376c191d 100644 --- a/workflow/engine/templates/cases/casesGenerateDocumentPage.js +++ b/workflow/engine/templates/cases/casesGenerateDocumentPage.js @@ -360,7 +360,15 @@ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -426,7 +434,15 @@ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 7c0b1559e..f974454ff 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -158,8 +158,16 @@ function deleteCase() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; - } + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } + } }); } else { if( rows.length > 0 ) { @@ -1321,7 +1329,15 @@ Ext.onReady ( function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -1416,7 +1432,15 @@ Ext.onReady ( function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -2218,7 +2242,15 @@ function reassign(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { diff --git a/workflow/engine/templates/cases/casesStartCase.js b/workflow/engine/templates/cases/casesStartCase.js index 69d95aa26..27ef4d53b 100755 --- a/workflow/engine/templates/cases/casesStartCase.js +++ b/workflow/engine/templates/cases/casesStartCase.js @@ -81,7 +81,15 @@ Ext.onReady(function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -113,7 +121,15 @@ Ext.onReady(function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -145,7 +161,15 @@ Ext.onReady(function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -179,7 +203,15 @@ Ext.onReady(function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -214,7 +246,15 @@ Ext.onReady(function() { icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -426,7 +466,15 @@ function openCaseA(n){ icon : Ext.MessageBox.ERROR, buttons : Ext.Msg.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { diff --git a/workflow/engine/templates/cases/casesUploadedDocumentsPage.js b/workflow/engine/templates/cases/casesUploadedDocumentsPage.js index 4a717ded5..136a31057 100644 --- a/workflow/engine/templates/cases/casesUploadedDocumentsPage.js +++ b/workflow/engine/templates/cases/casesUploadedDocumentsPage.js @@ -437,7 +437,15 @@ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = '../login/login'; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 22a4559d4..29d7b3e86 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -451,7 +451,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -481,7 +489,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -550,7 +566,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -621,7 +645,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -651,7 +683,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -681,7 +721,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -711,7 +759,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -741,7 +797,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -922,7 +986,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -1070,7 +1142,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -1100,7 +1180,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -1201,7 +1289,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else { @@ -1279,7 +1375,15 @@ Ext.onReady(function(){ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - top.location = top.location; + try + { + prnt = parent.parent; + top.location = top.location; + } + catch (err) + { + parent.location = parent.location; + } } }); } else {