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] figure: crash on deleting dragged figure #5328

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 6, 2024

Description

There was a traceback if a figure was deleted while being dragged.

Task: 4329240

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #5223

@robodoo
Copy link
Collaborator

robodoo commented Dec 6, 2024

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 6, 2024

@hokolomopo @LucasLefevre cherrypicking of pull request #5223 failed.

stdout:

Auto-merging src/components/figures/figure_container/figure_container.ts
CONFLICT (content): Merge conflict in src/components/figures/figure_container/figure_container.ts
Auto-merging src/components/helpers/drag_and_drop.ts
CONFLICT (content): Merge conflict in src/components/helpers/drag_and_drop.ts
CONFLICT (modify/delete): tests/components/figure.test.ts deleted in 4ec1734da6fad6bd59dda18138de936686abe36a and modified in 64d127b43c1fcd96e90464ea988b7fa4b7fc0831.  Version 64d127b43c1fcd96e90464ea988b7fa4b7fc0831 of tests/components/figure.test.ts 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

There was a traceback if a figure was deleted while being dragged.

Task: 4329240
X-original-commit: f535004
@hokolomopo hokolomopo force-pushed the 17.0-16.0-figure-dnd-delete-adrm-X0rV-fw branch from 0128f97 to d24b380 Compare December 9, 2024 07:14
@hokolomopo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Dec 9, 2024
There was a traceback if a figure was deleted while being dragged.

closes #5328

Task: 4329240
X-original-commit: f535004
Signed-off-by: Lucas Lefèvre (lul) <[email protected]>
Signed-off-by: Adrien Minne (adrm) <[email protected]>
@robodoo robodoo closed this Dec 9, 2024
@fw-bot fw-bot deleted the 17.0-16.0-figure-dnd-delete-adrm-X0rV-fw branch December 23, 2024 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants