Closed fw-bot closed 3 weeks ago
@rachico @rrahir cherrypicking of pull request odoo/o-spreadsheet#4325 failed.
stdout:
Auto-merging src/plugins/core/borders.ts
CONFLICT (content): Merge conflict in src/plugins/core/borders.ts
CONFLICT (modify/delete): tests/plugins/borders.test.ts deleted in HEAD and modified in 46c75aa76 ([FIX] border: bottom sheet borders removed on DELETE_ROWS). Version 46c75aa76 ([FIX] border: bottom sheet borders removed on DELETE_ROWS) of tests/plugins/borders.test.ts left in tree.
stderr:
13:17:55.788439 git.c:463 trace: built-in: git cherry-pick 46c75aa76af54f6958bd65d2f7c1ebff86dec646 --strategy ort
error: could not apply 46c75aa76... [FIX] border: bottom sheet borders removed on DELETE_ROWS
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+
[FIX] border: bottom sheet borders removed on DELETE_ROWS
Problem
Before this commit, when we add borders at the bottom of a sheet (at very the last rows), if we delete some rows in a position before the borders, some/all borders disappear (depending on how many rows we deleted). The reason being that the sheet plugin updates the total rows before we loop through them to shift the borders.
Solution
This commit fixes this behaviour by redefining the way we get the border to shift.
Task: 3911695
review checklist
Forward-Port-Of: odoo/o-spreadsheet#4527 Forward-Port-Of: odoo/o-spreadsheet#4325