[MERGE] forward port of branch 7.0 up to f1b9b30

This commit is contained in:
Christophe Simonis 2016-03-24 15:02:45 +01:00
commit d519daca1d
1 changed files with 1 additions and 0 deletions

View File

@ -5814,6 +5814,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
$img.css("max-height", "" + self.options.size[1] + "px");
});
$img.on('error', function() {
self.on_clear();
$img.attr('src', self.placeholder);
instance.webclient.notification.warn(_t("Image"), _t("Could not display the selected image."));
});