Skip to content
Snippets Groups Projects
Commit 196d6b16 authored by Samuel Degueldre's avatar Samuel Degueldre Committed by Jeremy Kersten
Browse files

[FIX] web_unsplash: unsplash images added on website break on products


Before this commit, selecting an unsplash image on website, then going
on a product page and selecting that same image in the media-dialog
would not work, and upon saving, the image would be the image
placeholder.

A previous fix in odoo/odoo#31328 added handling so that you could
choose unsplash images for a product, but it failed to account for
unsplash images that had already been added on a public view (for
example on a website page), which the user can choose in the
media-dialog.

This was caused by the fix only searching for the unsplash attachment on
the current model, and not among public attachments, resulting in an
empty search result.

This commit fixes that by adding that the attachment we are looking for
should either be on the current model, or be a public attachment.

closes odoo/odoo#46112

Signed-off-by: default avatarJérémy Kersten (jke) <jke@openerp.com>
parent 8776ee08
No related branches found
No related tags found
No related merge requests found
......@@ -19,8 +19,10 @@ class Image(models.AbstractModel):
res_id = int(res_id)
res_model = model._name
attachment = self.env['ir.attachment'].search([
'&', '|', '&',
('res_model', '=', res_model),
('res_id', '=', res_id),
('public', '=', True),
('url', '=', url_object.path),
], limit=1)
return attachment.datas
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment