[MERGE] forward port branch 10.0 up to 79bbd1dcb8c

1 files changed, 6 insertions, 2 deletions

diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js
index dee6f4599b4..e74ae67dc04 100644
--- a/addons/web/static/src/js/framework/ajax.js
+++ b/addons/web/static/src/js/framework/ajax.js
@@ -252,8 +252,12 @@ function get_file(options) {
                 if (options.error) {
                     var body = this.contentDocument.body;
                     var nodes = body.children.length === 0 ? body.childNodes : body.children;
-                    var node = nodes[1] || nodes[0];
-                    options.error(JSON.parse(node.textContent));
+                    options.error({
+                        message: nodes.length > 1 ? nodes[1].textContent : '',
+                        data: {
+                            title: nodes.length > 0 ? nodes[0].textContent : '',
+                        },
+                    });
                 }
             } finally {
                 complete();