From 94c7dff4eafb5b64ae6326d31e12fda03b209b74 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 27 Mar 2012 17:13:57 +0200
Subject: [PATCH] [FIX] usage issue of py.eval: in py.js 0.4, it returns a JS
 object not a PY object, so .toJSON should not be called on the result

bzr revid: xmo@openerp.com-20120327151357-4en4skjqb66b816c
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/view_page.js | 2 +-
 addons/web/static/src/js/views.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 8b1ec3098a6..b6788d979a5 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1605,7 +1605,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     init: function (view, node) {
         this._super(view, node);
         if (node.attrs.digits) {
-            this.digits = py.eval(node.attrs.digits).toJSON();
+            this.digits = py.eval(node.attrs.digits);
         } else {
             this.digits = view.fields_view.fields[node.attrs.name].digits;
         }
diff --git a/addons/web/static/src/js/view_page.js b/addons/web/static/src/js/view_page.js
index 50cc95cdea6..1e7c570abdf 100644
--- a/addons/web/static/src/js/view_page.js
+++ b/addons/web/static/src/js/view_page.js
@@ -93,7 +93,7 @@ openerp.web.page = function (openerp) {
         init: function (view, node) {
             this._super(view, node);
             if (node.attrs.digits) {
-                this.digits = py.eval(node.attrs.digits).toJSON();
+                this.digits = py.eval(node.attrs.digits);
             } else {
                 this.digits = view.fields_view.fields[node.attrs.name].digits;
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5be0fad74f0..43ecc8444fc 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -763,7 +763,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
         _(log_records.reverse()).each(function (record) {
             var context = {};
             if (record.context) {
-                try { context = py.eval(record.context).toJSON(); }
+                try { context = py.eval(record.context); }
                 catch (e) { /* TODO: what do I do now? */ }
             }
             $(_.str.sprintf('<li><a href="#">%s</a></li>', record.name))