From 542a6e9a671c59f73b93c022d0072fdba4dbe6b5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 5 Mar 2012 20:58:00 +0100
Subject: [PATCH] [FIX] @digits not honored by form view. field#digits not
 honored by page view.

lp bug: https://launchpad.net/bugs/943273 fixed

bzr revid: fme@openerp.com-20120305195800-uoiu74ee1rfm4tex
---
 addons/web/static/src/js/view_form.js |  7 +------
 addons/web/static/src/js/view_page.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6ae693dcd2e..335a4e39d72 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1526,16 +1526,11 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     init: function (view, node) {
         this._super(view, node);
         if (node.attrs.digits) {
-            this.parse_digits(node.attrs.digits);
+            this.digits = py.eval(node.attrs.digits).toJSON();
         } else {
             this.digits = view.fields_view.fields[node.attrs.name].digits;
         }
     },
-    parse_digits: function (digits_attr) {
-        // could use a Python parser instead.
-        var match = /^\s*[\(\[](\d+),\s*(\d+)/.exec(digits_attr);
-        return [parseInt(match[1], 10), parseInt(match[2], 10)];
-    },
     set_value: function(value) {
         if (value === false || value === undefined) {
             // As in GTK client, floats default to 0
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index ceddf3cc5ee..b34fd0e358b 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({
         template: 'FieldURI.readonly',
         scheme: null,
@@ -269,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',