odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] fixes a problem in pyeval catching all exceptions silently 

bzr revid: ged@openerp.com-20131113102204-m0gox7odwgkmon4o
This commit is contained in:
Gery Debongnie 2013-11-13 11:22:04 +01:00
parent 3be25d2c45
commit 30e6eadf42
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/web/static/src/js/pyeval.js
View File

@ -845,16 +845,18 @@
};
instance.web.pyeval.eval_domains_and_contexts = function (source) {
return new $.Deferred(function (d) {setTimeout(function () {
var result;
try {
var contexts = ([instance.session.user_context] || []).concat(source.contexts);
// see Session.eval_context in Python
d.resolve({
result = {
context: instance.web.pyeval.eval('contexts', contexts),
domain: instance.web.pyeval.eval('domains', source.domains),
group_by: instance.web.pyeval.eval('groupbys', source.group_by_seq || [])
});
};
} catch (e) {
d.resolve({ error: {
result = { error: {
code: 400,
message: instance.web._t("Evaluation Error"),
data: {
@ -863,8 +865,9 @@
instance.web._t("Local evaluation failure\n%s\n\n%s"),
e.message, JSON.stringify(source))
}
}});
}};
}
d.resolve(result);
}, 0); });
};
})();