[fix] problem with the view manager

bzr revid: nicolas.vanhoren@openerp.com-20120606131042-6t2y03giv2aoahjm

3 files changed, 49 insertions, 6 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c1969fafae3..fba01835808 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2283,6 +2283,28 @@
   color: #333333;
 }
 
+.openerp .oe_view_editor {
+  width: 100%;
+  border-collapse: collapse;
+  margin-left: -12px;
+  width: 100%;
+  background-color: white;
+  border-spacing: 0;
+}
+.openerp .oe_view_editor td {
+  text-align: center;
+  white-space: nowrap;
+  border: 1px solid #d8d8d8;
+  cursor: pointer;
+  font-size: 90%;
+}
+.openerp .oe_view_editor_field td {
+  border: 0px !important;
+}
+.openerp .oe_view_editor tr:hover {
+  background-color: #ecebf2;
+}
+
 .kitten-mode-activated {
   background-image: url(http://placekitten.com/g/1365/769);
   background-size: cover;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c2b92343bf4..10926189ddd 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1863,6 +1863,25 @@ $colour4: #8a89ba
         float: right
         color: #333
     // }}}
+//view editor
+.openerp
+    .oe_view_editor
+        width: 100%
+        border-collapse: collapse
+        margin-left: -12px
+        width: 100%
+        background-color: white
+        border-spacing: 0
+        td
+            text-align: center
+            white-space: nowrap
+            border: 1px solid #D8D8D8
+            cursor: pointer
+            font-size: 90%
+    .oe_view_editor_field td
+        border: 0px !important
+    .oe_view_editor tr:hover
+        background-color: #ecebf2
 
 .kitten-mode-activated
     background-image: url(http://placekitten.com/g/1365/769)
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index dd7f4728340..9fdd4f0bca1 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -52,10 +52,11 @@ instance.web.ViewEditor =   instance.web.OldWidget.extend({
         this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
-        this.action_manager.appendTo(this.view_edit_dialog);
         $.when(this.action_manager.do_action(action)).then(function() {
             var viewmanager = self.action_manager.inner_viewmanager,
                 controller = viewmanager.views[viewmanager.active_view].controller;
+            self.action_manager.appendTo(self.view_edit_dialog.$element);
+            self.action_manager.renderElement(self.view_edit_dialog);
             controller.on_loaded.add_last(function(){
                 $(controller.groups).bind({
                     'selected': function(e, ids, records) {
@@ -706,12 +707,12 @@ instance.web.ViewEditor =   instance.web.OldWidget.extend({
                          case "After":
                             self.edit_xml_dialog.$element.
                                 find("tr[id='viewedit-"+after_append+"']").after(clone);
-                            $(arch1).after(update_values[0]);
+                            $(arch1).after($(update_values[0]));
                             child_list.splice(index + 1, 0, object_xml);
                             break;
                         case "Before":
                             tr_click.before(clone);
-                            $(arch1).before(update_values[0]);
+                            $(arch1).before($(update_values[0]));
                             child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
@@ -722,7 +723,7 @@ instance.web.ViewEditor =   instance.web.OldWidget.extend({
                                         self.do_parent_img_hide_show(this);
                                 }));
                             }
-                            $(arch1).append(update_values[0]);
+                            $(arch1).append($(update_values[0]));
                             self.edit_xml_dialog.$element.
                                 find("tr[id='viewedit-"+after_append+"']").after(clone);
                             obj.child_id.push(object_xml);
@@ -839,6 +840,7 @@ instance.web.ViewEditor =   instance.web.OldWidget.extend({
             'string' : {'name':'string', 'string': 'String', 'type': 'char'},
             'required' : {'name':'required', 'string': 'Required', 'type': 'boolean'},
             'readonly' : {'name':'readonly', 'string': 'Readonly', 'type': 'boolean'},
+            'invisible' : {'name':'invisible', 'string': 'Invisible', 'type': 'boolean'},
             'domain' : {'name':'domain', 'string': 'Domain', 'type': 'char'},
             'context' : {'name':'context', 'string': 'Context', 'type': 'char'},
             'limit' : {'name':'limit', 'string': 'Limit', 'type': 'float'},
@@ -1134,12 +1136,12 @@ instance.web.ViewEditor.FieldFloat = instance.web.ViewEditor.FieldChar.extend({
 });
 
 var _PROPERTIES = {
-    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
+    'field' : ['name', 'string', 'required', 'readonly','invisible', 'domain', 'context', 'nolabel', 'completion',
                'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs', 'groups'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
-    'group' : ['string', 'col', 'colspan', 'states', 'attrs', 'groups'],
+    'group' : ['string', 'col', 'colspan','invisible', 'states', 'attrs', 'groups'],
     'image' : ['filename', 'width', 'height', 'groups'],
     'separator' : ['string', 'colspan', 'groups'],
     'label': ['string', 'align', 'colspan', 'groups'],