summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-01-02 15:31:58 +0100
committerChristophe Simonis <chs@odoo.com>2017-01-02 15:31:58 +0100
commitb3a1109372aca70f5839ed438039005ec59dee67 (patch)
treeb35cb11b45f1f381fa78784062d6f902aa864f2b /addons/web_editor/static/src
parent45352512a842e4193f09d11cf8517e3844eba4d1 (diff)
parentc08a590bb1b8177e505bfca64d14765e58ea0ef4 (diff)
[MERGE] forward port branch 10.0 up to c08a590bb1b
Diffstat (limited to 'addons/web_editor/static/src')
-rw-r--r--addons/web_editor/static/src/js/widgets.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js
index d3ad1e6fbc8..0b634b45b36 100644
--- a/addons/web_editor/static/src/js/widgets.js
+++ b/addons/web_editor/static/src/js/widgets.js
@@ -295,7 +295,9 @@ var ImageDialog = Widget.extend({
self.display_attachments();
});
this.fetch_existing().then(function () {
- self.set_image(_.find(self.records, function (record) { return record.url === o.url;}) || o);
+ if (o.url) {
+ self.set_image(_.find(self.records, function (record) { return record.url === o.url;}) || o);
+ }
});
return res;
},