[MERGE] from trunk

bzr revid: fva@openerp.com-20121029105126-gmc4b88e4ggon2l7
bzr revid: fva@openerp.com-20121029134120-7ipcitjtwhgzaqeu

5 files changed, 10 insertions, 3 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 33c90b9eda8..17b65ae91be 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2518,6 +2518,9 @@
 .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page {
   display: none !important;
 }
+.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_view_list, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_view_list {
+  min-height: 132px;
+}
 .openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add {
   font-weight: bold;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5d0446b6366..15e1898883d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1985,6 +1985,9 @@ $sheet-padding: 16px
         > .oe_view_manager
             .oe_list_pager_single_page
                 display: none !important
+            .oe_view_manager_view_list
+                min-height: 132px
+
         .oe_form_field_one2many_list_row_add
             font-weight: bold
         .oe_list_content
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 1f1112df2f2..220b9b63d5c 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -530,7 +530,8 @@ instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which o
 instance.web.qweb.debug = instance.session.debug;
 instance.web.qweb.default_dict = {
     '_' : _,
-    '_t' : instance.web._t
+    '_t' : instance.web._t,
+    'JSON': JSON,
 };
 instance.web.qweb.preprocess_node = function() {
     // Note that 'this' is the Qweb Node
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 9351f621324..520dcd9169f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -788,6 +788,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
 instance.web.search.fields = new instance.web.Registry({
     'char': 'instance.web.search.CharField',
     'text': 'instance.web.search.CharField',
+    'html': 'instance.web.search.CharField',
     'boolean': 'instance.web.search.BooleanField',
     'integer': 'instance.web.search.IntegerField',
     'id': 'instance.web.search.IntegerField',
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 67c5fa0292e..92e636b2216 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2539,7 +2539,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc
         if (! this.get("effective_readonly")) {
             self._updating_editor = false;
             this.$textarea = this.$el.find('textarea');
-            var width = ((this.node.attrs || {}).editor_width || 468);
+            var width = ((this.node.attrs || {}).editor_width || '100%');
             var height = ((this.node.attrs || {}).editor_height || 250);
             this.$textarea.cleditor({
                 width:      width, // width not including margins, borders or padding
@@ -3110,7 +3110,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                         type: 'ir.actions.act_window',
                         res_model: self.field.relation,
                         res_id: self.get("value"),
-                        context: self.build_context(),
                         views: [[false, 'form']],
                         target: 'current'
                     });