summaryrefslogtreecommitdiff
path: root/addons/base_import/static/src/js
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2016-08-17 11:43:17 +0200
committerNicolas Martinelli <nim@odoo.com>2016-08-17 11:43:17 +0200
commit717ca3390fedc4e56a0bf1e21c4bb8795e76b80c (patch)
tree01909668a5c4ac81e9ea7c514be20327c3da41cc /addons/base_import/static/src/js
parent907f9554d48d5c53661a84b314ffc75846556938 (diff)
[FIX] base_import: error message
During the import of a file, if the connection is closed (timeout, server shutdown...), a traceback appears. This is because `error.data.arguments` is not defined in this case. opw-682104
Diffstat (limited to 'addons/base_import/static/src/js')
-rw-r--r--addons/base_import/static/src/js/import.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 496a25bc9ab..7b5b801b8be 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -411,7 +411,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
return $.when([{
type: 'error',
record: false,
- message: error.data.arguments[1],
+ message: error.data.arguments && error.data.arguments[1] || error.message,
}]);
}) ;
},