From c4fc0f59926627f7148a9118c76bd0f268adabfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Thu, 22 May 2014 13:53:26 +0200 Subject: [PATCH] [IMP] work on scrollable zone in web client add a div parent to oe_view_manager_body, and move the searchview drawer inside oe_view_manager_body. This is in preparation to the goal of making the oe_view_manager_body div scrollable --- addons/web/static/src/js/views.js | 4 ++-- addons/web/static/src/xml/base.xml | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4cbf036e9f3..cbabba4e1f2 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -647,7 +647,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ _.each(_.keys(self.views), function(view_name) { var controller = self.views[view_name].controller; if (controller) { - var container = self.$el.find("> .oe_view_manager_body > .oe_view_manager_view_" + view_name); + var container = self.$el.find("> .oe_view_manager_parent > .oe_view_manager_body > .oe_view_manager_view_" + view_name); if (view_name === view_type) { container.show(); controller.do_show(view_options || {}); @@ -690,7 +690,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ controller.on('switch_mode', self, this.switch_mode); controller.on('previous_view', self, this.prev_view); - var container = this.$el.find("> .oe_view_manager_body > .oe_view_manager_view_" + view_type); + var container = this.$el.find("> .oe_view_manager_parent > .oe_view_manager_body > .oe_view_manager_view_" + view_type); var view_promise = controller.appendTo(container); this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e9ade4d14a5..f0673543b6c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -520,12 +520,13 @@ -
- +
- -
- +
+ +
+ +