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

fix(report_utils): ensure that delimiter and separator can't be empty (backport #26165) #26201

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

This results in them setting as undefined, which ends up as a string
in python, and the delimiter ends up as 'u', and the separator as
'undefined'.


This is an automatic backport of pull request #26165 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Apr 29, 2024
@mergify mergify bot requested a review from a team as a code owner April 29, 2024 10:11
@mergify mergify bot requested review from akhilnarang and removed request for a team April 29, 2024 10:11
Copy link
Contributor Author

mergify bot commented Apr 29, 2024

Cherry-pick of af611d4 has failed:

On branch mergify/bp/version-14-hotfix/pr-26165
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit af611d4bcb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/public/js/frappe/views/reports/report_utils.js

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

This results in them setting as `undefined`, which ends up as a string
in python, and the delimiter ends up as `'u'`, and the separator as
`'undefined'`.

(cherry picked from commit af611d4)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
@akhilnarang akhilnarang force-pushed the mergify/bp/version-14-hotfix/pr-26165 branch from 0327a63 to 5301516 Compare April 30, 2024 07:29
@akhilnarang akhilnarang merged commit f235018 into version-14-hotfix Apr 30, 2024
11 checks passed
@akhilnarang akhilnarang deleted the mergify/bp/version-14-hotfix/pr-26165 branch April 30, 2024 08:55
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.73.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants