Closed fw-bot closed 2 weeks ago
@dhrp-odoo @LucasLefevre cherrypicking of pull request odoo/o-spreadsheet#4596 failed.
stdout:
Auto-merging src/helpers/figures/charts/chart_ui_common.ts
CONFLICT (content): Merge conflict in src/helpers/figures/charts/chart_ui_common.ts
Auto-merging tests/figures/chart/chart_plugin.test.ts
stderr:
11:41:57.897771 git.c:463 trace: built-in: git cherry-pick 97d47ad0baedd8425ab5fd53ea839eab41ad926d --strategy ort
error: could not apply 97d47ad0b... [FIX] charts: truncate labels by default
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.
:warning: 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 r+ (I resolved the conflict myself to include this PR in the next o-spreadsheet release ;-) )
Description
This PR ensures that labels are truncated by default in charts. The truncation can be disabled by passing the
truncate
option to the chart configuration.Task: : 3958962
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4635 Forward-Port-Of: odoo/o-spreadsheet#4596