[MERGE] forward port branch saas-12.3 up to 752b2553c6

2019-08-08 11:52:13 +02:00
parent 22e0f88bce 752b2553c6
commit b792ba7d9a
168 changed files with 2719 additions and 2274 deletions
@@ -1603,8 +1603,8 @@ var FieldBinaryImage = AbstractFieldBinary.extend({
        }
        this.$('> img').remove();
        this.$el.prepend($img);
+
        $img.one('error', function () {
-            self._clearFile();
            $img.attr('src', self.placeholder);
            self.do_warn(_t("Image"), _t("Could not display the selected image."));
        });