summaryrefslogtreecommitdiff
path: root/addons/web_editor
diff options
context:
space:
mode:
authorNicolas Lempereur <nle@odoo.com>2021-03-30 14:23:48 +0000
committerNicolas Lempereur <nle@odoo.com>2021-03-30 15:27:26 +0000
commit43184af875f3eb52586348b383627cb0140484f5 (patch)
treeed00ae2ba951159b2faf7d59106b00c782c7e0be /addons/web_editor
parent610e1cea4b158c9fa28e63ab33cf7c7fa76873bf (diff)
[FIX] web_editor: show XML editor error if rejection value
Override in enterprise web_studio of _saveView on error never rejected promises. But now it does so the XML editor interface is not blocked after error. But we were already showing the correct error in web_studio use case, so we don't want another one and this change allow that by only showing an error if we received rejection value. opw-2460081 closes odoo/odoo#68554 Related: odoo/enterprise#17381 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Diffstat (limited to 'addons/web_editor')
-rw-r--r--addons/web_editor/static/src/js/common/ace.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/common/ace.js b/addons/web_editor/static/src/js/common/ace.js
index 439a27d55cc..0c3198dee44 100644
--- a/addons/web_editor/static/src/js/common/ace.js
+++ b/addons/web_editor/static/src/js/common/ace.js
@@ -629,6 +629,10 @@ var ViewEditor = Widget.extend({
var self = this;
return Promise.all(defs).guardedCatch(function (results) {
+ // some overrides handle errors themselves
+ if (results === undefined) {
+ return;
+ }
var error = results[1];
Dialog.alert(self, '', {
title: _t("Server error"),