[MERGE] 6.1 fixes into trunk

bzr revid: xmo@openerp.com-20120322113142-gim4svx01p336nxm

1 files changed, 19 insertions, 1 deletions

diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 95259a01927..50cc95cdea6 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -89,6 +89,16 @@ openerp.web.page = function (openerp) {
             return show_value;
         }
     });
+    openerp.web.page.FieldFloatReadonly = openerp.web.page.FieldCharReadonly.extend({
+        init: function (view, node) {
+            this._super(view, node);
+            if (node.attrs.digits) {
+                this.digits = py.eval(node.attrs.digits).toJSON();
+            } else {
+                this.digits = view.fields_view.fields[node.attrs.name].digits;
+            }
+        }
+    });
     openerp.web.page.FieldURIReadonly = openerp.web.page.FieldCharReadonly.extend({
         form_template: 'FieldURI.readonly',
         scheme: null,
@@ -96,6 +106,10 @@ openerp.web.page = function (openerp) {
             return value;
         },
         set_value: function (value) {
+            if (!value) {
+                this.$element.find('a').text('').attr('href', '#');
+                return;
+            }
             this.$element.find('a')
                     .attr('href', this.scheme + ':' + value)
                     .text(this.format_value(value));
@@ -106,6 +120,10 @@ openerp.web.page = function (openerp) {
     });
     openerp.web.page.FieldUrlReadonly = openerp.web.page.FieldURIReadonly.extend({
         set_value: function (value) {
+            if (!value) {
+                this.$element.find('a').text('').attr('href', '#');
+                return;
+            }
             var s = /(\w+):(.+)/.exec(value);
             if (!s) {
                 value = "http://" + value;
@@ -261,7 +279,7 @@ openerp.web.page = function (openerp) {
         'one2many_list' : 'openerp.web.page.FieldOne2ManyReadonly',
         'reference': 'openerp.web.page.FieldReferenceReadonly',
         'boolean': 'openerp.web.page.FieldBooleanReadonly',
-        'float': 'openerp.web.page.FieldCharReadonly',
+        'float': 'openerp.web.page.FieldFloatReadonly',
         'integer': 'openerp.web.page.FieldCharReadonly',
         'float_time': 'openerp.web.page.FieldCharReadonly',
         'binary': 'openerp.web.page.FieldBinaryFileReadonly',