odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] web: chain close action on wizard confirm 

If a wizard has several steps, or laucnh a second wizard, the view from where has been loaded the initial wizard is finally reloaded
This commit is contained in:
Denis Ledoux 2014-09-02 17:32:37 +02:00
parent 0bee015dd6
commit 57b48602fb
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/web/static/src/js/views.js
View File

@ -373,6 +373,10 @@ instance.web.ActionManager = instance.web.Widget.extend({
}
var widget = executor.widget();
if (executor.action.target === 'new') {
var pre_dialog = this.dialog;
if (pre_dialog){
pre_dialog.off('closing', null, pre_dialog.on_close);
}
if (this.dialog_widget && !this.dialog_widget.isDestroyed()) {
this.dialog_widget.destroy();
}
@ -380,7 +384,13 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.dialog = new instance.web.Dialog(this, {
dialogClass: executor.klass,
});
this.dialog.on("closing", null, options.on_close);
this.dialog.on_close = function(){
options.on_close.apply(null, arguments);
if (pre_dialog && pre_dialog.on_close){
pre_dialog.on_close();
}
};
this.dialog.on("closing", null, this.dialog.on_close);
this.dialog.dialog_title = executor.action.name;
if (widget instanceof instance.web.ViewManager) {
_.extend(widget.flags, {