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: valid, then invalid, then valid field value is correct #155621

Conversation

fw-bot
Copy link
Contributor

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

The commit odoo-dev@7452f85 was fixing the
problem in a simple way. It however wasn't good enough of a fix as we
discovered we were triggering too many onChange after the forward port.

So we revert commit odoo-dev@7452f85, and backport odoo-dev@5ffc604 from 17.1. It adds
a method on the model to reset the validity of a field.

It was not what felt the best, but as it is working and we just want to
fix the problem in stable, we go for it.

Forward-Port-Of: #155442
Forward-Port-Of: #154991

@robodoo
Copy link
Contributor

robodoo commented Feb 27, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 27, 2024

@SimonGenin @aab-odoo cherrypicking of pull request #154991 failed.

stdout:

Auto-merging addons/web/static/src/views/basic_relational_model.js
Auto-merging addons/web/static/src/views/fields/input_field_hook.js
CONFLICT (content): Merge conflict in addons/web/static/src/views/fields/input_field_hook.js
Auto-merging addons/web/static/src/views/relational_model.js

stderr:

17:25:22.274681 git.c:463               trace: built-in: git cherry-pick 23805e982d1db92a7ee270e4faea055b34c7ee10
error: could not apply 23805e982d1d... [FIX] web: valid, then invalid, then valid field value is correct
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 Feb 27, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Feb 27, 2024
The commit 7452f85 was fixing the
problem in a simple way. It however wasn't good enough of a fix as we
discovered we were triggering too many onChange after the forward port.

So we revert commit 7452f85, and backport 5ffc604 from 17.1. It adds
a method on the model to reset the validity of a field.

It was not what felt the best, but as it is working and we just want to
fix the problem in stable, we go for it.

opw 3680495

X-original-commit: 35d49cc
@SimonGenin SimonGenin force-pushed the saas-16.2-16.0-web-field-invalid-fix-2-ges-bRjj-fw branch from 8d00885 to 5327b6f Compare March 1, 2024 10:33
@SimonGenin
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested review from a team, Iucapad and juliusc2066 and removed request for a team March 1, 2024 10:39
robodoo pushed a commit that referenced this pull request Mar 1, 2024
The commit 7452f85 was fixing the
problem in a simple way. It however wasn't good enough of a fix as we
discovered we were triggering too many onChange after the forward port.

So we revert commit 7452f85, and backport 5ffc604 from 17.1. It adds
a method on the model to reset the validity of a field.

It was not what felt the best, but as it is working and we just want to
fix the problem in stable, we go for it.

opw 3680495

closes #155621

X-original-commit: 35d49cc
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Simon Genin (ges@odoo) <ges@odoo.com>
@robodoo robodoo closed this Mar 1, 2024
@fw-bot fw-bot deleted the saas-16.2-16.0-web-field-invalid-fix-2-ges-bRjj-fw branch March 15, 2024 14: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 RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants