summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-01-30 16:42:29 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-01-30 16:42:29 +0100
commit4cd744d3f844633ef2cfc8f69bbd22938a8d9fa7 (patch)
treecb2fa8f1ccaacee3c7021eb8edf46b0916ccca14
parent4a4282c245149f928e0c5751147abadf3c211780 (diff)
[IMP] small refactoring in javascript due to modifications to error messages in jsonrpc
bzr revid: nicolas.vanhoren@openerp.com-20130130154229-z0adpacyspmnl1vu
-rw-r--r--addons/edi/static/src/js/edi.js4
-rw-r--r--addons/web_analytics/static/src/js/web_analytics.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index ee4ddbb5e87..80002bd8743 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -63,8 +63,8 @@ instance.edi.EdiImport = instance.web.Widget.extend({
on_imported_error: function(response){
var self = this;
var msg = _t("Sorry, the document could not be imported.");
- if (response.data.fault_code) {
- msg += "\n " + _t("Reason:") + response.data.fault_code;
+ if (response.data.message) {
+ msg += "\n " + _t("Reason:") + response.data.message;
}
var params = {error: response, message: msg};
$(instance.web.qweb.render("CrashManager.warning", params)).dialog({
diff --git a/addons/web_analytics/static/src/js/web_analytics.js b/addons/web_analytics/static/src/js/web_analytics.js
index 26171cb32aa..28df9610bbf 100644
--- a/addons/web_analytics/static/src/js/web_analytics.js
+++ b/addons/web_analytics/static/src/js/web_analytics.js
@@ -227,7 +227,7 @@ openerp.web_analytics = function(instance) {
if (error.code) {
t._push_event({
'category': error.message,
- 'action': error.data.fault_code,
+ 'action': error.data.message,
'label': url,
'noninteraction': true,
});