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

BUG 11969 Web session TimeOut at HOME

Browse Source 
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.
This commit is contained in:
jennylee
2013-09-02 17:45:37 -04:00
parent 8dca1d056f
commit 312b8b4244
10 changed files with 298 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/methods/cases/cases_CatchExecute.php
View File

@@ -24,7 +24,15 @@
if (!isset($_SESSION['USER_LOGGED'])) { if (!isset($_SESSION['USER_LOGGED'])) {
G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
die( '<script type="text/javascript"> die( '<script type="text/javascript">
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
</script>'); </script>');
} }
/* Permissions */ /* Permissions */

8
workflow/engine/methods/cases/cases_SaveData.php
View File

@@ -25,7 +25,15 @@
if (!isset($_SESSION['USER_LOGGED'])) { if (!isset($_SESSION['USER_LOGGED'])) {
G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
die( '<script type="text/javascript"> die( '<script type="text/javascript">
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
</script>'); </script>');
} }
try { try {

8
workflow/engine/methods/cases/cases_Step.php
View File

@@ -2,7 +2,15 @@
if (!isset($_SESSION['USER_LOGGED'])) { if (!isset($_SESSION['USER_LOGGED'])) {
G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' ); G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
die( '<script type="text/javascript"> die( '<script type="text/javascript">
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
</script>'); </script>');
} }
/** /**

24
workflow/engine/templates/app/main.js
View File

@@ -79,8 +79,16 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid)
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} }
} }
@@ -385,8 +393,16 @@ function sendNote()
icon : Ext.MessageBox.ERROR, icon : Ext.MessageBox.ERROR,
buttons : Ext.Msg.OK, buttons : Ext.Msg.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Ext.getCmp('caseNoteText').setDisabled(false); Ext.getCmp('caseNoteText').setDisabled(false);
@@ -520,8 +536,16 @@ var openSummaryWindow = function(appUid, delIndex, action)
icon : Ext.MessageBox.ERROR, icon : Ext.MessageBox.ERROR,
buttons : Ext.Msg.OK, buttons : Ext.Msg.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
PMExt.warning(_('ID_WARNING'), response.message); PMExt.warning(_('ID_WARNING'), response.message);

8
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -466,8 +466,16 @@ function openActionDialog(caller, action, dataAux)
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
if (ext_itemgrid.getSelectionModel().getSelected().get("appDocType") == "Output" && ext_itemgrid.getSelectionModel().getSelected().get("outDocGenerate") != "") { if (ext_itemgrid.getSelectionModel().getSelected().get("appDocType") == "Output" && ext_itemgrid.getSelectionModel().getSelected().get("outDocGenerate") != "") {

16
workflow/engine/templates/cases/casesGenerateDocumentPage.js
View File

@@ -360,8 +360,16 @@
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
//generateDocumentGridGlobal construct //generateDocumentGridGlobal construct
@@ -426,8 +434,16 @@
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
//generateDocumentGridGlobal construct //generateDocumentGridGlobal construct

32
workflow/engine/templates/cases/casesList.js
View File

@@ -158,8 +158,16 @@ function deleteCase() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
if( rows.length > 0 ) { if( rows.length > 0 ) {
@@ -1321,8 +1329,16 @@ Ext.onReady ( function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
pauseCase(date); pauseCase(date);
@@ -1416,8 +1432,16 @@ Ext.onReady ( function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
var casesGrid_ = Ext.getCmp('casesGrid'); var casesGrid_ = Ext.getCmp('casesGrid');
@@ -2218,8 +2242,16 @@ function reassign(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
if( rows.length > 0 ) { if( rows.length > 0 ) {

48
workflow/engine/templates/cases/casesStartCase.js
View File

@@ -81,8 +81,16 @@ Ext.onReady(function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Ext.getCmp('processesFilter').setValue(''); Ext.getCmp('processesFilter').setValue('');
@@ -113,8 +121,16 @@ Ext.onReady(function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Ext.getCmp("startCaseTreePanel").root.expand(true); Ext.getCmp("startCaseTreePanel").root.expand(true);
@@ -145,8 +161,16 @@ Ext.onReady(function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Ext.getCmp("startCaseTreePanel").root.collapse(true); Ext.getCmp("startCaseTreePanel").root.collapse(true);
@@ -179,8 +203,16 @@ Ext.onReady(function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
tree = Ext.getCmp('startCaseTreePanel'); tree = Ext.getCmp('startCaseTreePanel');
@@ -214,8 +246,16 @@ Ext.onReady(function() {
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
showDetailsA(n); showDetailsA(n);
@@ -426,8 +466,16 @@ function openCaseA(n){
icon : Ext.MessageBox.ERROR, icon : Ext.MessageBox.ERROR,
buttons : Ext.Msg.OK, buttons : Ext.Msg.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Ext.Msg.show({ Ext.Msg.show({

10
workflow/engine/templates/cases/casesUploadedDocumentsPage.js
View File

@@ -437,7 +437,15 @@
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
top.location = '../login/login'; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {

104
workflow/engine/templates/cases/open.js
View File

@@ -451,8 +451,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Actions.tabFrame('processMap'); Actions.tabFrame('processMap');
@@ -481,8 +489,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
fieldset = { fieldset = {
@@ -550,8 +566,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
fieldset = { fieldset = {
@@ -621,8 +645,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Actions.tabFrame('caseHistory'); Actions.tabFrame('caseHistory');
@@ -651,8 +683,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Actions.tabFrame('messageHistory'); Actions.tabFrame('messageHistory');
@@ -681,8 +721,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Actions.tabFrame('dynaformHistory'); Actions.tabFrame('dynaformHistory');
@@ -711,8 +759,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Actions.tabFrame('uploadedDocuments'); Actions.tabFrame('uploadedDocuments');
@@ -741,8 +797,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
Actions.tabFrame('generatedDocuments'); Actions.tabFrame('generatedDocuments');
@@ -922,8 +986,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
win.show(); win.show();
@@ -1070,8 +1142,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
win.show(); win.show();
@@ -1100,8 +1180,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
if (Ext.getCmp('noteReason').getValue() != '') { if (Ext.getCmp('noteReason').getValue() != '') {
@@ -1201,8 +1289,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_DELETE_CASE'), function(){ PMExt.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_DELETE_CASE'), function(){
@@ -1279,8 +1375,16 @@ Ext.onReady(function(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
try
{
prnt = parent.parent;
top.location = top.location; top.location = top.location;
} }
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
tabId = name + 'MenuOption'; tabId = name + 'MenuOption';