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

diff --git a/js/inserts.js b/js/inserts.js
index c9736f6955df192c1b2f281c074dabdfb2cabe4b..022ce50990f9bd81ac2c1101e7929ef5f1298b70 100644 (file)
--- 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 51a7a491bfeedd96f7d9da8a12c4a560ba7358b5..900db5b08d20245dd0c384f96d4cee8d7e7bce66 100644 (file)
--- 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);