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_editor: issue with copy paste #158975

Conversation

fw-bot
Copy link
Contributor

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

Current behavior before PR:

When attempting to copy a button that is a direct child of a div tag, the div was unintentionally copied along with the button, leading to additional space upon pasting, along with the background color.

Desired behavior after PR is merged:

Now, only the button will be copied and pasted.

task-3764652

Forward-Port-Of: #155212

@robodoo
Copy link
Contributor

robodoo commented Mar 22, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 22, 2024

@dhba-odoo @dmo-odoo cherrypicking of pull request #155212 failed.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
CONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
Auto-merging addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js

stderr:

20:49:26.675937 git.c:463               trace: built-in: git cherry-pick 4ff5db4e557c8addbc7a7991888625225af17bce
error: could not apply 4ff5db4e557c... [FIX] web_editor: issue with copy paste
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 22, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Mar 22, 2024
Before this commit:

When attempting to copy a button that is a direct child of a div tag, the div
was unintentionally copied along with the button, leading to additional space
upon pasting, along with the background color.

After this commit:

Now, only the button will be copied and pasted

task-3764652

X-original-commit: b27b9ca
@dhba-odoo dhba-odoo force-pushed the 17.0-16.0-weird-behaviour-during-copy-paste-dhba-suH--fw branch from 8d3c79b to 7b7ffc8 Compare March 26, 2024 06:22
@C3POdoo C3POdoo requested a review from a team March 26, 2024 06:24
@dmo-odoo
Copy link
Contributor

@robodoo r+

@robodoo robodoo closed this in a42ca8f Mar 26, 2024
@fw-bot fw-bot deleted the 17.0-16.0-weird-behaviour-during-copy-paste-dhba-suH--fw branch April 9, 2024 10:47
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
Before this commit:

When attempting to copy a button that is a direct child of a div tag, the div
was unintentionally copied along with the button, leading to additional space
upon pasting, along with the background color.

After this commit:

Now, only the button will be copied and pasted

task-3764652

closes odoo#158975

X-original-commit: b27b9ca
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
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