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: validate fieldname in get_group_by_count (backport #21932) #21942

Merged
merged 2 commits into from
Aug 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2023

This is an automatic backport of pull request #21932 done by Mergify.
Cherry-pick of 5fce1a5 has failed:

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

You are currently cherry-picking commit 5fce1a57c0.
  (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)

Changes to be committed:
	modified:   frappe/model/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/listview.py
	both modified:   frappe/tests/test_listview.py
	both modified:   frappe/tests/test_model_utils.py

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix: validate fieldname in get_group_by_count

* test: call get_group_by_count with invalid field

* test: is_default_field

(cherry picked from commit 5fce1a5)

# Conflicts:
#	frappe/desk/listview.py
#	frappe/tests/test_listview.py
#	frappe/tests/test_model_utils.py
@mergify mergify bot requested a review from a team August 6, 2023 12:04
@mergify mergify bot added the conflicts label Aug 6, 2023
@mergify mergify bot requested review from maharshivpatel and removed request for a team August 6, 2023 12:04
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-21932 branch from 46af94b to efe3514 Compare August 6, 2023 12:10
@ankush ankush removed the conflicts label Aug 6, 2023
@ankush ankush merged commit dabbb73 into version-13-hotfix Aug 6, 2023
8 of 9 checks passed
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-21932 branch August 6, 2023 12:56
frappe-pr-bot pushed a commit that referenced this pull request Aug 9, 2023
## [13.58.5](v13.58.4...v13.58.5) (2023-08-09)

### Bug Fixes

* center notes text in FileUploader ([#21901](#21901)) ([19e1811](19e1811))
* check before deleting prepared report ([#21950](#21950)) ([#21951](#21951)) ([bc9a901](bc9a901))
* debounce form refresh from realtime events ([#21905](#21905)) ([#21906](#21906)) ([b81153f](b81153f))
* disable activity log global search ([5d9d04a](5d9d04a))
* only allow system manager to start backups ([d51e13a](d51e13a))
* **print:** Added properties page-width, page-height ([a966031](a966031))
* validate fieldname in get_group_by_count (backport [#21932](#21932)) ([#21942](#21942)) ([dabbb73](dabbb73))
* validate type in share.get_users ([#21931](#21931)) ([#21933](#21933)) ([1270e63](1270e63))

### Performance Improvements

* **customize_form:** rebuild global search in bg ([4725505](4725505))
* lower limit for global search ([8ff3353](8ff3353))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.58.5 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

None yet

3 participants