summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-10-22 17:22:57 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-10-22 17:22:57 +0200
commitdb54c70650f0cedc703bb48cde521baa0da303c8 (patch)
tree1e6851a8a5b2ec9413a56cf792f5ec6dcedec58b /addons/web/static/src
parent1da06f3bfe14be5bece5116bdd88b7077cf01604 (diff)
[FIX] resolved problem with buttons in views, also removed default Close button in wizards
bzr revid: nicolas.vanhoren@openerp.com-20121022152257-yxcz0j73b4azeqr1
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js1
-rw-r--r--addons/web/static/src/js/views.js1
2 files changed, 0 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dc6c4d0f0b3..506e0f199fe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -168,7 +168,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.$buttons = $(QWeb.render("FormView.buttons", {'widget':self}));
if (this.options.$buttons) {
- this.options.$buttons.children().remove();
this.$buttons.appendTo(this.options.$buttons);
} else {
this.$el.find('.oe_form_buttons').replaceWith(this.$buttons);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 2a5e1c4587e..103ad7a2661 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -300,7 +300,6 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.dialog_widget.destroy();
if (this.dialog === null || this.dialog.isDestroyed()) {
this.dialog = new instance.web.Dialog(this, {
- buttons: {"Close": function() {$(this).dialog("close")}},
dialogClass: executor.klass,
});
this.dialog.on("closing", null, options.on_close);