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] web: correctly update model in reference field #156051

Conversation

fw-bot
Copy link
Contributor

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

Steps to reproduce:

  • Install events
  • Open the app and click on an event
  • Go to communication tab
  • For one of the record change mail to sms, and set the template as "Event: Reminder"
  • Try to save

Issues:
A message notify the user that the template is not an sms.template even though the record is.

opw-3682157

Forward-Port-Of: #153808

@robodoo
Copy link
Contributor

robodoo commented Mar 1, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 1, 2024

@mattismegevand @fdardenne cherrypicking of pull request #153808 failed.

stdout:

Auto-merging addons/web/static/src/views/fields/reference/reference_field.js
CONFLICT (content): Merge conflict in addons/web/static/src/views/fields/reference/reference_field.js
Auto-merging addons/web/static/tests/views/fields/reference_field_tests.js

stderr:

12:25:52.387610 git.c:463               trace: built-in: git cherry-pick d6ea9475b08ed02e74cc1650470f0e0d78ac5c98
error: could not apply d6ea9475b08e... [FIX] web: correctly update model in reference field
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 1, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 1, 2024
@mattismegevand mattismegevand force-pushed the saas-16.2-16.0-opw-3682157-event_reference_field-mmeg-KfU0-fw branch from fdb9325 to 0fbd50e Compare March 1, 2024 13:22
Steps to reproduce:
- Install events
- Open the app and click on an event
- Go to communication tab
- For one of the record change mail to sms, and set the template as
  "Event: Reminder"
- Try to save

Issues:
A message notify the user that the template is not an sms.template even
though the record is.

opw-3682157

X-original-commit: 32e35d8
@mattismegevand mattismegevand force-pushed the saas-16.2-16.0-opw-3682157-event_reference_field-mmeg-KfU0-fw branch from 0fbd50e to 2f4989c Compare March 1, 2024 13:25
@C3POdoo C3POdoo requested review from a team, aab-odoo and BastienFafchamps and removed request for a team March 1, 2024 13:36
@mattismegevand
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 1, 2024
Steps to reproduce:
- Install events
- Open the app and click on an event
- Go to communication tab
- For one of the record change mail to sms, and set the template as
  "Event: Reminder"
- Try to save

Issues:
A message notify the user that the template is not an sms.template even
though the record is.

opw-3682157

closes #156051

X-original-commit: 32e35d8
Signed-off-by: Florent Dardenne (dafl) <dafl@odoo.com>
Signed-off-by: Mattis Megevand (mmeg) <mmeg@odoo.com>
@robodoo robodoo closed this Mar 1, 2024
@fw-bot fw-bot deleted the saas-16.2-16.0-opw-3682157-event_reference_field-mmeg-KfU0-fw branch March 15, 2024 19:46
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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants