diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js index 2ae53aabb22..6d9abc2bc9a 100644 --- a/addons/web/static/src/js/view_manager.js +++ b/addons/web/static/src/js/view_manager.js @@ -293,15 +293,16 @@ var ViewManager = Widget.extend(ControlPanelMixin, { render_view_control_elements: function() { if (!this.active_view.control_elements) { var view_controller = this.active_view.controller; + var $buttons = this.flags.$buttons; var elements = {}; if (!this.flags.headless) { elements = { - $buttons: !this.flags.footer_to_buttons ? $("
") : undefined, + $buttons: $("
"), $sidebar: $("
"), $pager: $("
"), }; } - view_controller.render_buttons(elements.$buttons); + view_controller.render_buttons($buttons ? $buttons.empty() : elements.$buttons); view_controller.render_sidebar(elements.$sidebar); view_controller.render_pager(elements.$pager); // Remove the unnecessary outer div diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index 7b947c1c494..96ae03eab2f 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -190,7 +190,6 @@ var FormView = View.extend(common.FieldManagerMixin, { this.$buttons.on('click', '.oe_form_button_cancel', this.guard_active(this.on_button_cancel)); - $node = $node || this.options.$buttons.empty(); if ($node) { this.$buttons.appendTo($node); } else { diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js index cb6daf093ce..b8d0c569609 100644 --- a/addons/web/static/src/js/views/list_view.js +++ b/addons/web/static/src/js/views/list_view.js @@ -282,7 +282,6 @@ var ListView = View.extend( /** @lends instance.web.ListView# */ { this.$buttons.find('.o_list_button_add').click(this.proxy('do_add_record')); - $node = $node || this.options.$buttons; if ($node) { this.$buttons.appendTo($node); } else { diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index bb37fc95569..fea90343fd9 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -259,7 +259,6 @@ var CalendarView = View.extend({ this.$buttons.find('.o_calendar_button_' + this.mode).addClass('active'); - $node = $node || this.options.$buttons; if ($node) { this.$buttons.appendTo($node); } else { diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 078197d1e88..a7431a3c780 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -361,7 +361,6 @@ var DiagramView = View.extend({ self.add_node(); }); - $node = $node || this.options.$buttons; this.$buttons.appendTo($node); }, diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js index 3ae65d76be9..b6ab9a10012 100644 --- a/addons/web_kanban/static/src/js/kanban_view.js +++ b/addons/web_kanban/static/src/js/kanban_view.js @@ -312,7 +312,6 @@ var KanbanView = View.extend({ this.$buttons = $(QWeb.render("KanbanView.buttons", {'widget': this, display: display})); this.$buttons.on('click', 'button.o-kanban-button-new', this.add_record.bind(this)); - $node = $node || this.options.$buttons; this.$buttons.appendTo($node); },