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

[REVERT] revert commit 3224 because it didn't reproduced the original behavior and some on_close were forgotten 

bzr revid: nicolas.vanhoren@openerp.com-20121015133815-hmkz6h1bkhnbq7up
This commit is contained in:
niv-openerp 2012-10-15 15:38:15 +02:00
parent a99934dc78
commit ed445ff91a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/static/src/js/chrome.js
View File

@ -70,7 +70,7 @@ instance.web.Dialog = instance.web.Widget.extend({
autoOpen: false, autoOpen: false,
position: [false, 40], position: [false, 40],
buttons: {}, buttons: {},
beforeClose: function () { self.close(); }, beforeClose: function () { self.on_close(); },
resizeStop: this.on_resized resizeStop: this.on_resized
}; };
for (var f in this) { for (var f in this) {
@ -150,14 +150,16 @@ instance.web.Dialog = instance.web.Widget.extend({
var res = this.start(); var res = this.start();
return res; return res;
}, },
close: function() { close: function() {
this.$el.dialog('close');
},
on_close: function() {
if (this.__tmp_dialog_destroying) if (this.__tmp_dialog_destroying)
return; return;
if (this.dialog_options.destroy_on_close) { if (this.dialog_options.destroy_on_close) {
this.__tmp_dialog_closing = true; this.__tmp_dialog_closing = true;
this.destroy(); this.destroy();
this.__tmp_dialog_closing = undefined; this.__tmp_dialog_closing = undefined;
this.trigger("dialog_close");
} }
}, },
on_resized: function() { on_resized: function() {

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

@ -296,9 +296,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
buttons: { "Close": function() { $(this).dialog("close"); }}, buttons: { "Close": function() { $(this).dialog("close"); }},
dialogClass: executor.klass dialogClass: executor.klass
}); });
if (on_close) { if(on_close)
this.dialog.on("dialog_close", this, on_close); this.dialog.on_close.add(on_close);
}
} else { } else {
this.dialog_widget.destroy(); this.dialog_widget.destroy();
} }

1
addons/web_view_editor/static/src/js/view_editor.js
View File

@ -67,6 +67,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
{text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }} {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
] ]
}).open(); }).open();
this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
this.main_view_id = this.parent.fields_view.view_id; this.main_view_id = this.parent.fields_view.view_id;
this.action_manager = new instance.web.ActionManager(this); this.action_manager = new instance.web.ActionManager(this);
this.action_manager.appendTo(this.view_edit_dialog.$el); this.action_manager.appendTo(this.view_edit_dialog.$el);