From 9d1e3b75340747b417169fd2bc02abaf92625522 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 18 Nov 2011 13:00:41 +0530 Subject: [PATCH 1/2] [FIX] action is ir_actions_report_xml then wizard automatically close. lp bug: https://launchpad.net/bugs/891342 fixed bzr revid: ysa@tinyerp.com-20111118073041-x28pnecgtredpc97 --- addons/web/static/src/js/views.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index eff94b95ad7..4429610a213 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -143,7 +143,7 @@ session.web.ActionManager = session.web.Widget.extend({ var ClientWidget = session.web.client_actions.get_object(action.tag); (this.client_widget = new ClientWidget(this, action.params)).appendTo(this); }, - ir_actions_report_xml: function(action) { + ir_actions_report_xml: function(action, on_closed) { var self = this; $.blockUI(); self.rpc("/web/session/eval_domain_and_context", { @@ -157,6 +157,10 @@ session.web.ActionManager = session.web.Widget.extend({ data: {action: JSON.stringify(action)}, complete: $.unblockUI }); + if (!self.dialog && on_closed) { + on_closed(); + } + self.dialog_stop(); }); }, ir_actions_act_url: function (action) { @@ -882,7 +886,7 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{ } }; var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {}); - + var handler = function (r) { var action = r.result; if (action && action.constructor == Object) { From 7ec009c0ba245552f06c678629c1ef5964adbda7 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 21 Nov 2011 14:44:51 +0530 Subject: [PATCH 2/2] [FIX] fix problem of close popup in actio type of ir_actions_report_xml. bzr revid: ysa@tinyerp.com-20111121091451-i9lvmv6yibys17vp --- addons/web/static/src/js/views.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4429610a213..90060f47fc1 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -155,12 +155,14 @@ session.web.ActionManager = session.web.Widget.extend({ self.session.get_file({ url: '/web/report', data: {action: JSON.stringify(action)}, - complete: $.unblockUI - }); - if (!self.dialog && on_closed) { - on_closed(); - } - self.dialog_stop(); + complete: $.unblockUI, + success: function(){ + if (!self.dialog && on_closed) { + on_closed(); + } + self.dialog_stop(); + } + }) }); }, ir_actions_act_url: function (action) {