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: dont allow querying files to website users (backport #25094) #25700

Merged
merged 3 commits into from
Apr 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2024


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

* test: create desk user in file tests

* fix: dont allow querying files to website users

* test: make commiting test user optional

(cherry picked from commit bd66168)

# Conflicts:
#	frappe/core/doctype/file/test_file.py
#	frappe/core/doctype/user/test_user.py
@mergify mergify bot requested a review from a team March 28, 2024 11:44
@mergify mergify bot added the conflicts label Mar 28, 2024
@mergify mergify bot requested review from akhilnarang and removed request for a team March 28, 2024 11:44
@mergify mergify bot assigned ankush Mar 28, 2024
Copy link
Contributor Author

mergify bot commented Mar 28, 2024

Cherry-pick of bd66168 has failed:

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

You are currently cherry-picking commit bd661688e9.
  (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/core/doctype/file/file.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/file/test_file.py
	both modified:   frappe/core/doctype/user/test_user.py

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

@ankush ankush enabled auto-merge (squash) April 6, 2024 12:24
@ankush ankush removed the conflicts label Apr 6, 2024
@ankush ankush merged commit da5953c into version-14-hotfix Apr 6, 2024
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-25094 branch April 6, 2024 12:40
frappe-pr-bot pushed a commit that referenced this pull request Apr 9, 2024
# [14.71.0](v14.70.0...v14.71.0) (2024-04-09)

### Bug Fixes

* add params in make_request arguments ([e16ebb7](e16ebb7))
* auto add modified index when sort_field is set to it (backport [#25686](#25686)) ([#25785](#25785)) ([0d57f1e](0d57f1e))
* bigint validation (backport [#25733](#25733)) ([#25821](#25821)) ([b2608b3](b2608b3))
* check if user exists in browse command ([a8c09d3](a8c09d3))
* cint -> avoid precision loss if already integer ([#25735](#25735)) ([#25736](#25736)) ([176cbd3](176cbd3))
* copy paste from Excel (issue [#24371](#24371)) ([30da5c5](30da5c5))
* copy paste from Excel (issue [#24371](#24371)) ([8d3d2e9](8d3d2e9))
* don't show bulk actions for doctype with workflow ([6703592](6703592))
* dont allow querying files to website users (backport [#25094](#25094)) ([#25700](#25700)) ([da5953c](da5953c))
* Get filter value based on depends_on field ([#25861](#25861)) ([#25863](#25863)) ([31b4453](31b4453))
* **grid:** don't crash if row doesn't exist ([db85d3c](db85d3c))
* **grid:** ensure that `doc.name` is truthy before proceeding ([#25800](#25800)) ([#25828](#25828)) ([71edfab](71edfab))
* Handle empty value of datetime control ([291ab66](291ab66))
* **layout:** handle `fieldobj` being null ([4c11499](4c11499))
* **link:** get_input_value returns `""` ([#25878](#25878)) ([#25882](#25882)) ([1e70ac8](1e70ac8))
* make_request - prevents an error during response parsing if the response body is empty. ([#24613](#24613)) ([d5c86a7](d5c86a7))
* max-width of email attachment filename ([d678571](d678571))
* only try JSON if content-type says so ([#24936](#24936)) ([e3c5ec4](e3c5ec4))
* respect custom filters on report export ([#25886](#25886)) ([f32b5d8](f32b5d8))
* type error in workflow ([#25847](#25847)) ([#25848](#25848)) ([835e43f](835e43f))

### Features

* add upstream json argument to integrations make_request ([#22462](#22462)) ([46a396e](46a396e))
* Include `before_print` in doctype event of Server Script (backport [#25858](#25858)) ([a36c68c](a36c68c))

### Performance Improvements

* **Scheduling:** add jitter to job scheduling ([#25856](#25856)) ([2a88f87](2a88f87)), closes [#19007](#19007)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.71.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 Apr 24, 2024
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

2 participants