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

[FIX] modified action manager to use the $buttons of Dialog when it instantiate a ViewManager in a Dialog 

bzr revid: nicolas.vanhoren@openerp.com-20121016124135-xkll7ugawv9ae6bq
This commit is contained in:
niv-openerp 2012-10-16 14:41:35 +02:00
parent 44b468c466
commit 35df43c491
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,17 +291,20 @@ instance.web.ActionManager = instance.web.Widget.extend({
var widget = executor.widget();
if (executor.action.target === 'new') {
if (this.dialog === null || this.dialog.isDestroyed()) {
// These buttons will be overwrited by <footer> if any
this.dialog = new instance.web.Dialog(this, {
buttons: { "Close": function() { $(this).dialog("close"); }},
buttons: {"Close": function() {$(this).dialog("close")}},
dialogClass: executor.klass
});
if (on_close)
this.dialog.on("closing", null, on_close);
this.dialog.init_dialog();
} else {
this.dialog_widget.destroy();
}
this.dialog.dialog_title = executor.action.name;
if (widget instanceof instance.web.ViewManager) {
_.extend(widget.flags, {$buttons: this.dialog.$buttons,});
}
this.dialog_widget = widget;
var initialized = this.dialog_widget.appendTo(this.dialog.$el);
this.dialog.open();