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

[IMP] small refactoring in javascript due to modifications to error messages in jsonrpc 

bzr revid: nicolas.vanhoren@openerp.com-20130130154229-z0adpacyspmnl1vu
This commit is contained in:
niv-openerp 2013-01-30 16:42:29 +01:00
parent 4a4282c245
commit 4cd744d3f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/edi/static/src/js/edi.js
View File

@ -63,8 +63,8 @@ instance.edi.EdiImport = instance.web.Widget.extend({
on_imported_error: function(response){ on_imported_error: function(response){
var self = this; var self = this;
var msg = _t("Sorry, the document could not be imported."); var msg = _t("Sorry, the document could not be imported.");
if (response.data.fault_code) { if (response.data.message) {
msg += "\n " + _t("Reason:") + response.data.fault_code; msg += "\n " + _t("Reason:") + response.data.message;
} }
var params = {error: response, message: msg}; var params = {error: response, message: msg};
$(instance.web.qweb.render("CrashManager.warning", params)).dialog({ $(instance.web.qweb.render("CrashManager.warning", params)).dialog({

2
addons/web_analytics/static/src/js/web_analytics.js
View File

@ -227,7 +227,7 @@ openerp.web_analytics = function(instance) {
if (error.code) { if (error.code) {
t._push_event({ t._push_event({
'category': error.message, 'category': error.message,
'action': error.data.fault_code, 'action': error.data.message,
'label': url, 'label': url,
'noninteraction': true, 'noninteraction': true,
}); });