Skip to content

Conversation

@fw-bot
Copy link
Contributor

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

Steps to reproduce:

  • wrap a pivot function inside a IFERROR e.g. =IFERROR(PIVOT("1", "probability"), 42)
  • reload the spreadsheet
  • before the pivot is loaded (throttle the network in the dev tools): right click the cell
  • click on "See records" menu item => boom

Task: 3847477
X-original-commit: odoo/enterprise@31401c75baa4252917fe5d808be0abd5fc23a906


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #162750
Forward-Port-Of: #162568

@robodoo
Copy link
Contributor

robodoo commented Apr 21, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 21, 2024

@LucasLefevre cherrypicking of pull request #162568 failed.

stdout:

Auto-merging addons/spreadsheet/static/src/pivot/pivot_actions.js
CONFLICT (content): Merge conflict in addons/spreadsheet/static/src/pivot/pivot_actions.js
Auto-merging addons/spreadsheet/static/src/pivot/plugins/pivot_ui_plugin.js
CONFLICT (content): Merge conflict in addons/spreadsheet/static/src/pivot/plugins/pivot_ui_plugin.js
Auto-merging addons/spreadsheet/static/tests/pivots/pivot_see_records_test.js
CONFLICT (content): Merge conflict in addons/spreadsheet/static/tests/pivots/pivot_see_records_test.js
Auto-merging addons/spreadsheet_dashboard/static/tests/clickable_cells/clickable_cells.js
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/static/tests/clickable_cells/clickable_cells.js

stderr:

09:54:01.547270 git.c:463               trace: built-in: git cherry-pick 525339fe3732941a6c4bd19e0072a2aaaec293d6
error: could not apply 525339fe3732... [FIX] documents_spreadsheet: fix See record menu if not loaded
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

@C3POdoo C3POdoo added the RD research & development, internal work label Apr 21, 2024
@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Apr 21, 2024
Steps to reproduce:

- wrap a pivot function inside a IFERROR e.g. =IFERROR(PIVOT("1", "probability"), 42)
- reload the spreadsheet
- before the pivot is loaded (throttle the network in the dev tools): right click the cell
- click on "See records" menu item
=> boom

Task: 3847477
X-original-commit: aeadd06
@LucasLefevre LucasLefevre force-pushed the 17.0-16.0-15.0-see-record-shadowed-error-lul-DAVs-fw-bis-g5z3-fw branch from a13014d to c94abfd Compare April 21, 2024 08:33
Copy link
Contributor

@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 robodoo closed this in 7351f42 Apr 21, 2024
@fw-bot fw-bot deleted the 17.0-16.0-15.0-see-record-shadowed-error-lul-DAVs-fw-bis-g5z3-fw branch May 5, 2024 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants