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

[Vidhin Mehta (OpenERP)]

Render selected record from list view in Manage View.

Unmerged revisions

3868. By Vidhin Mehta (OpenERP) on 2013-03-28

[FIX]view editor's wrong view_id pass

=== modified file 'addons/web_view_editor/static/src/js/view_editor.js'
--- addons/web_view_editor/static/src/js/view_editor.js	2013-03-21 15:28:31 +0000
+++ addons/web_view_editor/static/src/js/view_editor.js	2013-03-28 10:52:21 +0000
@@ -15,7 +15,7 @@
                 }
                 evt.currentTarget.selectedIndex = 0;
         }else{
-            return this._super.apply(this,arguments); 
+            return this._super.apply(this,arguments);
         }
     }
 });
@@ -73,12 +73,10 @@
         $.when(this.action_manager.do_action(action)).done(function() {
             var viewmanager = self.action_manager.inner_widget;
             var controller = viewmanager.views[viewmanager.active_view].controller;
-            controller.on('view_loaded', self, function(){
-                $(controller.groups).bind({
-                    'selected': function(e, ids, records) {
-                        self.main_view_id = ids[0];
-                    }
-                });
+            $(controller.groups).bind({
+                'selected': function(e, ids, records) {
+                    self.main_view_id = ids[0];
+                }
             });
         });
     },
@@ -412,6 +410,7 @@
                 }},
                 {text: _t("Close"), click: function(){
                     self.action_manager.inner_widget.views[self.action_manager.inner_widget.active_view].controller.reload_content();
+                    self.main_view_id = self.parent.fields_view.view_id;
                     self.edit_xml_dialog.close();
                 }}
             ]
@@ -535,7 +534,7 @@
         var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
         parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0];
         _.each([tr, parent_tr],function(element) {
-            var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false; 
+            var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
             property_to_check.push(value);
         });
         field_dataset.call( 'fields_get', []).done(function(result) {
@@ -1186,7 +1185,7 @@
 //e.g.:xyz 'td' : ['field']
 };
 // Generic html_tag list and can be added html tag in future. It's support above _CHILDREN dict's *html_tag* by default.
-// For specific child node one has to define tag above and specify children tag in list. Like above xyz example. 
+// For specific child node one has to define tag above and specify children tag in list. Like above xyz example.
 var html_tag = ['div','h1','h2','h3','h4','h5','h6','td','tr'];
 
 var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',