From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Mon, 6 Jun 2011 10:19:51 +0000 (+0200)
Subject: Timeout on long processing like backup/restore emlarged to 10min
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=846ad2e041a695e1baf24c41ec26af3b8ff8ed6d;p=textcart.git

Timeout on long processing like backup/restore emlarged to 10min
---

diff --git a/js/inserts.js b/js/inserts.js
index c9736f6..022ce50 100644
--- a/js/inserts.js
+++ b/js/inserts.js
@@ -243,7 +243,7 @@ var inserts = {
 					save_focus(e);
 					var asp = e.getAttribute('aspect')
 					if (asp && asp.indexOf('process') !== -1)
-						JsHttpRequest.request(this, null, 60000);
+						JsHttpRequest.request(this, null, 600000); // ten minutes for backup
 					else
 						JsHttpRequest.request(this);
 				}
@@ -447,7 +447,7 @@ function setHotKeys() {
 					if (((asp && asp.indexOf('default') !== -1) && key==13)||((asp && asp.indexOf('cancel') !== -1) && key==27)) {
 						if (validate(el)) {
 							if (asp.indexOf('process') !== -1)
-								JsHttpRequest.request(el, null, 60000);
+								JsHttpRequest.request(el, null, 600000);
 							else
 								JsHttpRequest.request(el);
 						}
diff --git a/js/utils.js b/js/utils.js
index 51a7a49..900db5b 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -35,7 +35,7 @@ function disp_msg(msg, cl) {
 // 
 JsHttpRequest.request= function(trigger, form, tout) {
 //	if (trigger.type=='submit' && !validate(trigger)) return false;
-	tout = tout | 6000;	// default timeout value
+	tout = tout || 6000;	// default timeout value
 	document.getElementById('msgbox').innerHTML='';
 	set_mark(tout>10000 ? 'progressbar.gif' : 'ajax-loader.gif');
 	JsHttpRequest._request(trigger, form, tout, 0);