diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-03-28 12:29:16 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-03-28 12:29:16 +0200 |
| commit | ddcb6cd1c1908bce0d941e1ba3b20a825d196a68 (patch) | |
| tree | 39e05296d5852899cb9ab80d08b566a4105af624 /addons/web/static/src/js/views.js | |
| parent | d6d9e2602de2a7467fad2e2cbb3eb4e2208aae33 (diff) | |
| parent | 603485baa1ef0d905659f2cae0919cb45d57e925 (diff) | |
[MERGE] Merge trunk
bzr revid: fme@openerp.com-20120328102916-hietshrabuomha3w
Diffstat (limited to 'addons/web/static/src/js/views.js')
| -rw-r--r-- | addons/web/static/src/js/views.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 58d11f017f4..54d9b5118e5 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)) |