[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6641] property: login for expired session
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6641] property: login for expired session |
|
Date: |
Sat, 04 Dec 2010 17:48:58 +0000 |
Revision: 6641
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6641
Author: sigurdne
Date: 2010-12-04 17:48:58 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
property: login for expired session
Modified Paths:
--------------
trunk/property/js/yahoo/property.js
trunk/property/js/yahoo/tts.add.js
Modified: trunk/property/js/yahoo/property.js
===================================================================
--- trunk/property/js/yahoo/property.js 2010-12-03 14:59:43 UTC (rev 6640)
+++ trunk/property/js/yahoo/property.js 2010-12-04 17:48:58 UTC (rev 6641)
@@ -324,20 +324,53 @@
*/
this.onSearchClick = function()
{
- //no es necesario actualizar los valores actuales de
path_value. Este es global y siempre esta actualizado
- for(i=0;i<textImput.length;i++)
+ var callback4 =
{
- var busq =
encodeURIComponent(YAHOO.util.Dom.get(textImput[i].id).value);
- eval("path_values."+textImput[i].name+"='"+busq+"'")
- }
+ success: function(o)
+ {
+ var values = [];
+ try
+ {
+ values = JSON.parse(o.responseText);
+ }
+ catch (e)
+ {
+ return;
+ }
- //si esta configurado que la busqueda sea por fechas
- if(config_values.date_search != undefined &&
config_values.date_search != 0)
- {
- path_values.start_date =
YAHOO.util.Dom.get('start_date').value;
- path_values.end_date =
YAHOO.util.Dom.get('end_date').value;
- }
- execute_ds();
+ if(values['sessionExpired'] == true)
+ {
+ window.alert('sessionExpired - please
log in');
+
lightboxlogin('onSearchClick');//defined i phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+ //no es necesario actualizar los
valores actuales de path_value. Este es global y siempre esta actualizado
+ for(i=0;i<textImput.length;i++)
+ {
+ var busq =
encodeURIComponent(YAHOO.util.Dom.get(textImput[i].id).value);
+
eval("path_values."+textImput[i].name+"='"+busq+"'")
+ }
+
+ //si esta configurado que la busqueda
sea por fechas
+ if(config_values.date_search !=
undefined && config_values.date_search != 0)
+ {
+ path_values.start_date =
YAHOO.util.Dom.get('start_date').value;
+ path_values.end_date =
YAHOO.util.Dom.get('end_date').value;
+ }
+ execute_ds();
+ }
+ },
+ failure: function(o)
+ {
+ window.alert('failure - try again - once')
+ },
+ timeout: 1000
+ };
+
+ var oArgs = {menuaction:'property.bocommon.confirm_session'};
+ var strURL = phpGWLink('index.php', oArgs, true);
+ var request = YAHOO.util.Connect.asyncRequest('POST', strURL,
callback4);
}
/********************************************************************************
*
@@ -753,12 +786,19 @@
myLoading.hide();
}
values_ds = JSON.parse(o.responseText);
- // eval('values_ds ='+o.responseText);
- flag_particular_setting='update';
- particular_setting();
-
myPaginator.setRowsPerPage(values_ds.recordsReturned,true);
- update_datatable();
- update_filter();
+ if(values_ds['sessionExpired'] == true)
+ {
+ window.alert('sessionExpired - please
log in');
+ lightboxlogin();//defined i
phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+ flag_particular_setting='update';
+ particular_setting();
+
myPaginator.setRowsPerPage(values_ds.recordsReturned,true);
+ update_datatable();
+ update_filter();
+ }
},
failure: function(o) {window.alert('Server or your
connection is dead.')},
timeout: 10000,
Modified: trunk/property/js/yahoo/tts.add.js
===================================================================
--- trunk/property/js/yahoo/tts.add.js 2010-12-03 14:59:43 UTC (rev 6640)
+++ trunk/property/js/yahoo/tts.add.js 2010-12-04 17:48:58 UTC (rev 6641)
@@ -1,40 +1,40 @@
this.confirm_session = function(action)
{
- var callback = {
- success: function(o)
- {
- var values = [];
- try
- {
- values
= JSON.parse(o.responseText);
- //
console.log(values);
- }
- catch (e)
- {
- return;
- }
+ var callback =
+ {
+ success: function(o)
+ {
+ var values = [];
+ try
+ {
+ values = JSON.parse(o.responseText);
+// console.log(values);
+ }
+ catch (e)
+ {
+ return;
+ }
-
if(values['sessionExpired'] == true)
- {
-
window.alert('sessionExpired - please log in');
-
lightboxlogin();//defined i phpgwapi/templates/portico/js/base.js
- }
- else
- {
-
document.getElementById(action).value = 1;
-
document.form.submit();
- }
+ if(values['sessionExpired'] == true)
+ {
+ window.alert('sessionExpired - please
log in');
+ lightboxlogin();//defined i
phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+ document.getElementById(action).value =
1;
+ document.form.submit();
+ }
- },
- failure: function(o)
- {
-
window.alert('failure - try again - once')
- },
- timeout: 1000
- };
+ },
+ failure: function(o)
+ {
+ window.alert('failure - try again - once')
+ },
+ timeout: 1000
+ };
var oArgs = {menuaction:'property.bocommon.confirm_session'};
var strURL = phpGWLink('index.php', oArgs, true);
var request = YAHOO.util.Connect.asyncRequest('POST', strURL,
callback);
}
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6641] property: login for expired session,
Sigurd Nes <=