Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats #159586

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 27, 2024

Description of the issue/feature this PR addresses:

Replace the use of 't-esc' with 't-field' for the payment icon image in the icons list template. The latter, for an image field, provides two options for rendering the payment icon image: use the PIL library to obtain the image when given the option 'qweb_img_raw_data', or use a URL. The former only considers the first option, allowing only image formats compatible with the PIL library.

Current behavior before PR:

Only image formats compatible with the PIL library can be used for the payment icons.

Desired behavior after PR is merged:

Other formats including the ones compatible with the PIL library can be used for the payment icons.


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #159522
Forward-Port-Of: #158728

@robodoo
Copy link
Contributor

robodoo commented Mar 27, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 27, 2024

@CLaurelB @AntoineVDV cherrypicking of pull request #158728 failed.

stdout:

CONFLICT (modify/delete): addons/payment/views/payment_templates.xml deleted in HEAD and modified in 7506d6f26fe4 ([FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats).  Version 7506d6f26fe4 ([FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats) of addons/payment/views/payment_templates.xml left in tree.

stderr:

22:06:03.252671 git.c:463               trace: built-in: git cherry-pick 7506d6f26fe4b0460c3ae0c3c8d001c11aedeab9
error: could not apply 7506d6f26fe4... [FIX] Payment: prevent error in rendering payment icon list with PIL incompatible icon image formats
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 27, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 27, 2024
@CLaurelB
Copy link
Contributor

Hello @AntoineVDV, since the payment icon image has been replaced by the payment method image in version 17.0, the solution needed to be updated for the forward port. The new approach is in the following PR: #159603

…incompatible icon image formats

Replace the use of 't-esc' with 't-field' for the payment icon image in
the icons list template. The latter, for an image field, provides two
options for rendering the payment icon image: use the PIL library to
obtain the image when given the option 'qweb_img_raw_data', or use a
URL. The former only considers the first option, allowing only image
formats compatible with the PIL library.

X-original-commit: bc76cca
@AntoineVDV AntoineVDV force-pushed the 17.0-16.0-replace_directive_expression-CLaurelB-4tsZ-fw branch from 45221eb to 78d2c21 Compare March 28, 2024 09:19
@AntoineVDV
Copy link
Contributor

@robodoo r+

@AntoineVDV
Copy link
Contributor

Hi @CLaurelB, yes indeed. I made the changes in this PR to keep working on the forward-port chain ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants