diff options
| author | Samuel Degueldre <sad@odoo.com> | 2020-10-29 09:59:52 +0000 |
|---|---|---|
| committer | Samuel Degueldre <sad@odoo.com> | 2020-10-29 10:51:07 +0000 |
| commit | b0993370b6fcec1f966e4bf2994eee7f31da82d5 (patch) | |
| tree | 3d1579424ce877d4b8c1ea573c783b71b54ba734 /addons/web_editor/static/src | |
| parent | daa5011e6cc26a756a9bc5b082b846baf735c5eb (diff) | |
[FIX] web_editor: fix issues related to loading image info
In order to allow modifying background images, we need information on
the image, this is done by creating a placeholder img and calling the
loadImageInfo function on it. However this function did not account for
the case where an image had not src attribute, which causes an
unnecessary rpc. Other problems could arise from this as an attachment
that doesn't have the correct mimetype but has a matching src could be
returned, causing its image_src field to be false, which we would then
attempt to load as a valid image, causing crashes.
This commit fixes that by not trying to load image infos when the src of
an image is empty, only looking for attachments of the supported
mimetypes, and also checking that we actually did receive an image_src
before setting it as the original src of the image, which will prevent
accidentally trying to load a falsy src as an actual image.
closes odoo/odoo#60953
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/image_processing.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/web_editor/static/src/js/editor/image_processing.js b/addons/web_editor/static/src/js/editor/image_processing.js index 7a30b60346e..e3497634678 100644 --- a/addons/web_editor/static/src/js/editor/image_processing.js +++ b/addons/web_editor/static/src/js/editor/image_processing.js @@ -305,17 +305,19 @@ async function activateCropper(image, aspectRatio, dataset) { * this would be passed as 'this._rpc.bind(this)' from widgets. */ async function loadImageInfo(img, rpc) { + const src = img.getAttribute('src'); // If there is a marked originalSrc, the data is already loaded. - if (img.dataset.originalSrc) { + if (img.dataset.originalSrc || !src) { return; } const {original} = await rpc({ route: '/web_editor/get_image_info', - params: {src: img.getAttribute('src').split(/[?#]/)[0]}, + params: {src: src.split(/[?#]/)[0]}, }); // Check that url is local. - if (original && new URL(original.image_src, window.location.origin).origin === window.location.origin) { + const isLocal = original && new URL(original.image_src, window.location.origin).origin === window.location.origin; + if (isLocal && original.image_src) { img.dataset.originalId = original.id; img.dataset.originalSrc = original.image_src; img.dataset.mimetype = original.mimetype; |
