summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework/ajax.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-04-25 15:48:31 +0200
committerChristophe Simonis <chs@odoo.com>2016-04-25 15:48:31 +0200
commit2dcbdd077881ea4efb32e029dcdf194529fe9a83 (patch)
treeeb9f410667186bd01d88d673f74f21cd3bb510f4 /addons/web/static/src/js/framework/ajax.js
parentf5f7df9df24ddd937d403d004c02f779cb4848b7 (diff)
parentbb8f0f1fc3d0f5574938019ca69cc917a55e7962 (diff)
[MERGE] forward port of branch saas-10 up to bb8f0f1
Diffstat (limited to 'addons/web/static/src/js/framework/ajax.js')
-rw-r--r--addons/web/static/src/js/framework/ajax.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js
index 0301cd4e96c..71c742b026c 100644
--- a/addons/web/static/src/js/framework/ajax.js
+++ b/addons/web/static/src/js/framework/ajax.js
@@ -204,7 +204,9 @@ function get_file(options) {
// opening a new window seems the best way to workaround
if (navigator.userAgent.match(/(iPod|iPhone|iPad)/)) {
var params = _.extend({}, options.data || {}, {token: token});
- var url = this.url(options.url, params);
+ var url = options.session.url(options.url, params);
+ if (options.complete) { options.complete(); }
+
return window.open(url);
}