Skip to content

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Feb 5, 2025

Currently signup.js also defines SignUpForm, which overrides the reset password behavior. This bug is not present in 16.0, so I used the same name for the registry that is being used in 16.0.

Forward-Port-Of: #196389

Currently signup.js also defines SignUpForm, which overrides the reset
password behavior. This bug is not present in 16.0, so I used the same
name for the registry that is being used in 16.0.

X-original-commit: 731819e
@robodoo
Copy link
Contributor

robodoo commented Feb 5, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Feb 5, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 5, 2025

@bram1000 @flvr-odoo cherrypicking of pull request #196389 failed.

stdout:

CONFLICT (modify/delete): addons/auth_signup/static/src/js/reset_password.js deleted in b37cae124e69b55e2698b035fd2f439cb551268f and modified in 76030c849c9b508af19debe8d050997700d0a890.  Version 76030c849c9b508af19debe8d050997700d0a890 of addons/auth_signup/static/src/js/reset_password.js left in tree.

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

@C3POdoo C3POdoo added the RD research & development, internal work label Feb 5, 2025
@bram1000 bram1000 closed this Feb 5, 2025
@xmo-odoo xmo-odoo deleted the master-17.0-fix-resetpassword-spinner-brvg-414078-fw branch March 7, 2025 10:29
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.

4 participants