summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views.js
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2013-07-31 09:29:14 +0200
committerOlivier Dony <odo@openerp.com>2013-07-31 09:29:14 +0200
commitcf9d7aaa5f35fd15d894eeb5d830cf66b83924b8 (patch)
treef6527a3dcc0160ac523806a298efa4617ee726b6 /addons/web/static/src/js/views.js
parent658c021df8bb71075dc8eabb117105b8257b4db3 (diff)
parentc46331a3ca36f9e6a9504d1d2c2e4b7171bfb665 (diff)
[MERGE] Forward-port of latest bugfixes from 7.0 up to rev 4007 (launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81)
bzr revid: dle@openerp.com-20130627115936-iw2x6yjejabkc8ys bzr revid: chs@openerp.com-20130702141958-zxkppo4c6zvpo0uf bzr revid: odo@openerp.com-20130731072914-0uk62hnao5x502hh
Diffstat (limited to 'addons/web/static/src/js/views.js')
-rw-r--r--addons/web/static/src/js/views.js14
1 files changed, 14 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 60e2b50bbce..e24b9894e3f 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -470,6 +470,20 @@ instance.web.ActionManager = instance.web.Widget.extend({
}).then(function(res) {
action = _.clone(action);
action.context = res.context;
+
+ // iOS devices doesn't allow iframe use the way we do it,
+ // opening a new window seems the best way to workaround
+ if (navigator.userAgent.match(/(iPod|iPhone|iPad)/)) {
+ var params = {
+ action: JSON.stringify(action),
+ token: new Date().getTime()
+ }
+ var url = self.session.url('/web/report', params)
+ instance.web.unblockUI();
+ $('<a href="'+url+'" target="_blank"></a>')[0].click();
+ return;
+ }
+
var c = instance.webclient.crashmanager;
return $.Deferred(function (d) {
self.session.get_file({