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][REV][FIX] side_panel: cf rule range bugs #3451

Closed
wants to merge 1 commit into from

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 16, 2024

This reverts commit 4a956f3.

the task was not fixing bugs (in the sens of tracebacks or corrupted
behaviour) but rather seemingly backporting a feture introduced in
later versions. Since the implementation was not accounting for every
case and that it' not fixing any behaviour, just improving the user
experience, it's better to cancel it.

Description:

description of this task, what is implemented and why it is implemented that way.

Task: : TASK_ID

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: #3449

@robodoo
Copy link
Collaborator

robodoo commented Jan 16, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 16, 2024

@rrahir cherrypicking of pull request #3449 failed.

stdout:

Auto-merging src/components/selection_input/selection_input.ts
Auto-merging src/components/side_panel/conditional_formatting/conditional_formatting.ts
Auto-merging tests/components/conditional_formatting.test.ts
CONFLICT (content): Merge conflict in tests/components/conditional_formatting.test.ts
Auto-merging tests/components/selection_input.test.ts

stderr:

12:43:38.939469 git.c:463               trace: built-in: git cherry-pick 512940cbb54c8fe3fffeeb75d8e595b3b52ed477
error: could not apply 512940cbb... [REV][FIX] side_panel: cf rule range bugs
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.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

This reverts commit f752519.
The task was not fixing bugs (in the sens of tracebacks or corrupted
behaviour) but rather seemingly backporting a feture introduced in
later versions. Since the implementation was not accounting for every
case and that it' not fixing any behaviour, just improving the user
experience, it's better to cancel it.

X-original-commit: ce7412e
@rrahir rrahir force-pushed the saas-16.2-16.0-revert-3446-rar-ztIl-fw branch from 69a23a4 to d425f73 Compare January 16, 2024 12:14
@rrahir
Copy link
Collaborator

rrahir commented Jan 16, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Jan 16, 2024
This reverts commit f752519.
The task was not fixing bugs (in the sens of tracebacks or corrupted
behaviour) but rather seemingly backporting a feture introduced in
later versions. Since the implementation was not accounting for every
case and that it' not fixing any behaviour, just improving the user
experience, it's better to cancel it.

closes #3451

X-original-commit: ce7412e
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
@robodoo robodoo closed this Jan 16, 2024
@fw-bot fw-bot deleted the saas-16.2-16.0-revert-3446-rar-ztIl-fw branch January 30, 2024 12:47
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.

None yet

3 participants