odoo/odoo#158975
Created by fw-bot
Merged
at a42ca8f3ba74c608dd5fd31f69148ca01d9eb2e4
- label
- odoo-dev:17.0-16.0-weird-behaviour-during-copy-paste-dhba-suH--fw
- head
- 7b7ffc88edd08fcb181888ef7ac6412933efbec7
- target
- 17.0
- merged
- 2 months ago by Editor, David Monjoie (dmo)
- forward-port of
- odoo/odoo#155212 DETACHED (conflicts: ('4ff5db4e557c8addbc7a7991888625225af17bce', 'Auto-merging addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js\nCONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js\nAuto-merging addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js\n', '20:49:26.675937 git.c:463 trace: built-in: git cherry-pick 4ff5db4e557c8addbc7a7991888625225af17bce\nerror: could not apply 4ff5db4e557c... [FIX] web_editor: issue with copy paste\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['4ff5db4e557c8addbc7a7991888625225af17bce']) ('4ff5db4e557c8addbc7a7991888625225af17bce', 'Auto-merging addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js\nCONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js\nAuto-merging addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js\n', '20:49:26.675937 git.c:463 trace: built-in: git cherry-pick 4ff5db4e557c8addbc7a7991888625225af17bce\nerror: could not apply 4ff5db4e557c... [FIX] web_editor: issue with copy paste\nhint: After resolving the conflicts, mark them with\nhint: "git add/rm <pathspec>", then run\nhint: "git cherry-pick --continue".\nhint: You can instead skip this commit with "git cherry-pick --skip".\nhint: To abort and get back to the state before "git cherry-pick",\nhint: run "git cherry-pick --abort".\n----------\nstatus:\n', ['4ff5db4e557c8addbc7a7991888625225af17bce']))
[FW][FIX] web_editor: issue with copy paste
**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: odoo/odoo#155212