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: Return empty result if no perm level access (backport #24591) #24592

Merged
merged 2 commits into from
Jan 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2024

This is an automatic backport of pull request #24591 done by Mergify.
Cherry-pick of 3bea50d has failed:

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

You are currently cherry-picking commit 3bea50d519.
  (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/db_query.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/tests/test_db_query.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

(cherry picked from commit 3bea50d)

# Conflicts:
#	frappe/tests/test_db_query.py
@mergify mergify bot requested a review from a team January 29, 2024 14:19
@mergify mergify bot added the conflicts label Jan 29, 2024
@mergify mergify bot requested review from ankush and removed request for a team January 29, 2024 14:19
@mergify mergify bot assigned ankush Jan 29, 2024
@ankush ankush merged commit adcbeee into version-14-hotfix Jan 29, 2024
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-24591 branch January 29, 2024 14:21
frappe-pr-bot pushed a commit that referenced this pull request Jan 30, 2024
# [14.64.0](v14.63.0...v14.64.0) (2024-01-30)

### Bug Fixes

* **Custom Field:** default fieldname in rename fieldname prompt ([#24492](#24492)) ([#24580](#24580)) ([7cdda1e](7cdda1e))
* **grid_row:** sort options based on selected data first, so as to maintain order ([b0e4b19](b0e4b19))
* ignore dead columns in user_settings ([#24572](#24572)) ([#24573](#24573)) ([5d2441d](5d2441d))
* improve translatability of search results ([#24498](#24498)) ([a74ba6c](a74ba6c))
* Missing traduction in the query popup ([051d622](051d622))
* **mobile:** scroll issue after workspace change ([#24555](#24555)) ([#24585](#24585)) ([7245292](7245292))
* Return empty result if no perm level access (backport [#24591](#24591)) ([#24592](#24592)) ([adcbeee](adcbeee))
* **search:** Fix URL encoding for search result ([#24558](#24558)) ([44ec1e3](44ec1e3))
* sentry minor fix ([#24588](#24588)) ([23f77ef](23f77ef))
* translatability ([#24553](#24553)) ([41d2fe2](41d2fe2))

### Features

* `frappe.db.sql` results `as_iterator` (backport [#19810](#19810)) (backport [#24346](#24346)) ([#24562](#24562)) ([7f3a12b](7f3a12b)), closes [#24365](#24365)

### Reverts

* Revert "fix(data_import): respect the value of show_failed_logs checkbox" ([3c7f494](3c7f494))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.64.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 Feb 14, 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