Merge lp:~openerp-dev/openerp-web/7.0-timesheet-vme into lp:openerp-web/7.0

[Vidhin Mehta (OpenERP)]

# In *instance.web.ViewManager* it selects only first element to render view and not the accurate element.

Test Case:
# goto Human Resources -> My Current Timesheet and switch between form-list.(List view is blank)
To see video : https://docs.google.com/open?id=0By4GWTWr6HDNckhiQ2lYbDVTbnM

Solution:
# Given unique "id" to each ViewManager template's *div.oe_view_manager_view*, find that "id" and "view_type" to select element.

[Fabien Meghazi (OpenERP) (fme)]

Could you elaborate your first sentence ? I don't understand what this branch is supposed to fix.

review: Needs Information

[Vidhin Mehta (OpenERP) (vme-openerp)]

> Could you elaborate your first sentence ? I don't understand what this branch
> is supposed to fix.

>> In class *instance.web.ViewManager* in that method *do_create_view* for *container* variable.

>> container holds list of element which is find by (".oe_view_manager_view_" + view_type).

>> when appending controller to container it will select first element of *container*,not accurate element.

>> So, in solution when creating hook given unique_id,so it will helpfull while finding accurate container.

>> From menu when form view load first (and contain one2manylist) than switching to list,it shows blank.because
 list view rendered on wrong container.

[Fabien Meghazi (OpenERP) (fme)]

Ok, I see. Please do not use those id stuff. Just change the selector.

Eg: "> .oe_view_manager_body > .oe_view_manager_view_" + view_name + ":first"

review: Needs Resubmitting

[lp:~openerp-dev/openerp-web/7.0-timesheet-vme]

3710. By Vidhin Mehta (OpenERP) on 2013-02-20

[MERGE]7.0

3711. By Vidhin Mehta (OpenERP) on 2013-02-20

[FIX]select accurate element with use of 'child selector'.

[Vidhin Mehta (OpenERP) (vme-openerp)]

Good Idea.Even no need of ":first".

review: Needs Resubmitting

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-02-19 18:15:19 +0000
+++ addons/web/static/src/js/views.js	2013-02-20 13:28:21 +0000
@@ -576,7 +576,7 @@
             _.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 @@
         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);