Yogesh(Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-891342-ysa into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #891342 in OpenERP Web: "trunk : The wizards which end in calling report
do not get closed"
https://bugs.launchpad.net/openerp-web/+bug/891342
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-891342-ysa/+merge/82644
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-891342-ysa/+merge/82644
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-891342-ysa.
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2011-11-17 11:18:57 +0000
+++ addons/web/static/src/js/views.js 2011-11-18 08:43:24 +0000
@@ -143,7 +143,7 @@
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 @@
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 @@
}
};
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) {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
