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

Merge pull request #2024 from Jennydmz/BUG-11969a

Browse Source 
BUG 11969 Web session TimeOut at HOME
This commit is contained in:
julceslauhub
2013-09-03 13:48:12 -07:00
parent a9445e0171 312b8b4244
commit b01659786f
10 changed files with 303 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,9 +22,17 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com. * Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/ */
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">
parent.location = "../cases/casesListExtJs?action=selfservice"; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
</script>'); </script>');
} }
/* Permissions */ /* Permissions */

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

@@ -22,11 +22,19 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com. * Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/ */
//validate the data post //validate the data post
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">
parent.location = "../cases/casesStartPage?action=startCase"; try
</script>'); {
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
</script>');
} }
try { try {
if ($_GET['APP_UID'] !== $_SESSION['APPLICATION']) { if ($_GET['APP_UID'] !== $_SESSION['APPLICATION']) {

10
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">
parent.location = "../cases/casesStartPage?action=startCase"; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
</script>'); </script>');
} }
/** /**

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

@@ -79,7 +79,15 @@ 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) {
location = 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, icon : Ext.MessageBox.ERROR,
buttons : Ext.Msg.OK, buttons : Ext.Msg.OK,
fn : function(btn) { fn : function(btn) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -520,7 +536,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {

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

@@ -466,7 +466,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {

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

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

42
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) {
location = location; try
} {
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
}
}); });
} else { } else {
if( rows.length > 0 ) { if( rows.length > 0 ) {
@@ -1321,7 +1329,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -1416,7 +1432,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -2218,7 +2242,15 @@ function reassign(){
icon: Ext.MessageBox.ERROR, icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
fn : function(btn) { fn : function(btn) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {

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

@@ -81,7 +81,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -113,7 +121,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -145,7 +161,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -179,7 +203,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -214,7 +246,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -426,7 +466,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {

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 {

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

@@ -451,7 +451,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -481,7 +489,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -550,7 +566,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -621,7 +645,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -651,7 +683,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -681,7 +721,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -711,7 +759,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -741,7 +797,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -922,7 +986,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -1070,7 +1142,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -1100,7 +1180,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -1201,7 +1289,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {
@@ -1279,7 +1375,15 @@ 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) {
location = location; try
{
prnt = parent.parent;
top.location = top.location;
}
catch (err)
{
parent.location = parent.location;
}
} }
}); });
} else { } else {