Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

FIX 

testing in all cases is better catch errno in JSON.parse.
attrs[action] is always “string” type.
pull/200/head
Cristian Salamea 2015-08-11 10:42:13 -05:00
parent 476ea597f2
commit c8887fd2f9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web_action_conditionable/static/src/js/views.js
View File

@ -5,9 +5,10 @@ openerp.web_action_conditionable = function (instance) {
is_action_enabled: function(action) { is_action_enabled: function(action) {
var attrs = this.fields_view.arch.attrs; var attrs = this.fields_view.arch.attrs;
if (action in attrs) { if (action in attrs) {
if ($.type(attrs[action]) == 'boolean') { try {
return JSON.parse(attrs[action]) data = JSON.parse(attrs[action]);
} else { return data;
} catch(error) {
var expr = attrs[action]; var expr = attrs[action];
var expression = py.parse(py.tokenize(expr)); var expression = py.parse(py.tokenize(expr));
var cxt = this.dataset.get_context().__eval_context.__contexts[1]; var cxt = this.dataset.get_context().__eval_context.__contexts[1];