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

[MERGE] [FIX] viewmanager handles the wrong view dom node in some cases. 

Example of the problem:

When the first view is a form and contains a *2many field (with embedded list view),
the viewmanager wrongly handle the embedded list view instead of the main list view (if any)

This could be experienced in HR > My Current Timesheet

bzr revid: fme@openerp.com-20130220152152-hgqwqju34167l9x9
This commit is contained in:
Fabien Meghazi 2013-02-20 16:21:52 +01:00
parent 8711625764 4212725417
commit a7376a5686
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,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(".oe_view_manager_view_" + view_name + ":first");
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 || {});
@ -619,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(".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);