[MERGE] adding timeout option to rpc calls

bzr revid: fva@openerp.com-20130712125158-63p24xm18zffpg86
2013-07-12 14:51:58 +02:00
parent 17db55200b 16d3b79dfd
commit 050b6b0ec5
1 changed files with 3 additions and 0 deletions
@@ -1012,6 +1012,9 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
        if (! options.shadow)
            this.trigger('request', url, payload);
        
+        if (options.timeout)
+            url.timeout = options.timeout;
+
        this.rpc_function(url, payload).then(
            function (response, textStatus, jqXHR) {
                if (! options.shadow)