summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-01-02 14:38:59 +0100
committerChristophe Simonis <chs@odoo.com>2017-01-02 14:38:59 +0100
commit81f59cee2cea76fe40cef9913382c0259bf38512 (patch)
tree3ae3b00e8af6c919d6b02d314abbf5909c932fe8 /addons/web_editor/static/src/js
parentd3538dbe475ebd933be86035b8bbc61a856b032f (diff)
parentb844d938890938629357c6df54ee687a3b52ffbe (diff)
[MERGE] forward port branch saas-11 up to b844d938890
Diffstat (limited to 'addons/web_editor/static/src/js')
-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;
},