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] Checkbox: unused className prop in checkbox #3986

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 5, 2024

Description:

  • Modified the checkbox.xml file to incorporate the className prop within the Checkbox component.

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

@robodoo
Copy link
Collaborator

robodoo commented Apr 5, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 5, 2024

@dhrp-odoo @LucasLefevre cherrypicking of pull request #3985 failed.

stdout:

Auto-merging src/components/side_panel/components/checkbox/checkbox.xml
CONFLICT (content): Merge conflict in src/components/side_panel/components/checkbox/checkbox.xml
Auto-merging tests/side_panels/components/checkbox.test.ts

stderr:

09:17:08.688358 git.c:463               trace: built-in: git cherry-pick 752014578714c6621b0d850f2fb34b36802d0067
error: could not apply 752014578... [FIX] Checkbox: unused className prop in checkbox
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

Modified the checkbox.xml file to incorporate the
className prop within the Checkbox component

X-original-commit: 0832463
@dhrp-odoo dhrp-odoo force-pushed the saas-17.2-saas-17.1-fix-unused-classname-prop-in-checkbox-dhrp-WDC8-fw branch from eca1ffd to 25da9c9 Compare April 5, 2024 12:03
@dhrp-odoo
Copy link
Contributor

@LucasLefevre,Conflicts resolved!

Copy link
Collaborator

@LucasLefevre LucasLefevre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

robodoo r+

robodoo pushed a commit that referenced this pull request Apr 5, 2024
Modified the checkbox.xml file to incorporate the
className prop within the Checkbox component

closes #3986

X-original-commit: 0832463
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
@robodoo robodoo closed this Apr 5, 2024
@fw-bot fw-bot deleted the saas-17.2-saas-17.1-fix-unused-classname-prop-in-checkbox-dhrp-WDC8-fw branch April 19, 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

4 participants