From 0709ca97e86a5b4895dd065f15d54410d48ba5c0 Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Tue, 22 Jan 2013 11:28:56 +0530 Subject: [PATCH 1/2] [FIX]View not redering @ proper position. bzr revid: vme@tinyerp.com-20130122055856-iby255hebyxb72rs --- addons/web/static/src/js/views.js | 5 +++-- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 9fd49367171..10d4104921b 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -472,6 +472,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.registry = instance.web.views; this.views_history = []; this.view_completely_inited = $.Deferred(); + this.uniqueid_dom = _.uniqueId('view_manager'); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -539,7 +540,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_view_" + view_name + ":first"); + var container = self.$el.find("#" + self.uniqueid_dom + ".oe_view_manager_view_" + view_name); if (view_name === view_type) { container.show(); controller.do_show(view_options || {}); @@ -582,7 +583,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_view_" + view_type); + var container = this.$el.find("#" + this.uniqueid_dom + ".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 6d707bb4627..3e510329683 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -520,7 +520,7 @@
-
+
From 42127254175d9b85f14d9b7d5eae1f5cd979c79c Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Wed, 20 Feb 2013 18:56:34 +0530 Subject: [PATCH 2/2] [FIX]select accurate element with use of 'child selector'. bzr revid: vme@tinyerp.com-20130220132634-6ycdntomequypxfw --- addons/web/static/src/js/views.js | 5 ++--- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 5d1e16f4999..63c1b88dff6 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -509,7 +509,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.registry = instance.web.views; this.views_history = []; this.view_completely_inited = $.Deferred(); - this.uniqueid_dom = _.uniqueId('view_manager'); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -577,7 +576,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("#" + self.uniqueid_dom + ".oe_view_manager_view_" + view_name); + var container = self.$el.find("> .oe_view_manager_body > .oe_view_manager_view_" + view_name); if (view_name === view_type) { container.show(); controller.do_show(view_options || {}); @@ -620,7 +619,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("#" + this.uniqueid_dom + ".oe_view_manager_view_" + view_type); + var container = this.$el.find("> .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 e639e9d07ee..08d072d61d5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -521,7 +521,7 @@
-
+