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: never show virtual fields in list view (backport #24666) #26578

Merged
merged 2 commits into from
May 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 27, 2024

  • fix: never render virtual fields in list view
  • fix: Hide "in list view" for virtual columns

closes #24660


This is an automatic backport of pull request #24666 done by Mergify.

* fix: never render virtual fields in list view

* fix: Hide "in list view" for virtual columns

(cherry picked from commit 4553de8)

# Conflicts:
#	frappe/core/doctype/docfield/docfield.json
#	frappe/core/doctype/docfield/docfield.py
#	frappe/custom/doctype/customize_form_field/customize_form_field.json
#	frappe/custom/doctype/customize_form_field/customize_form_field.py
@mergify mergify bot added the conflicts label May 27, 2024
Copy link
Contributor Author

mergify bot commented May 27, 2024

Cherry-pick of 4553de8 has failed:

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

You are currently cherry-picking commit 4553de8ba0.
  (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/public/js/frappe/list/base_list.js
	modified:   frappe/public/js/frappe/list/list_view.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/docfield/docfield.json
	both modified:   frappe/core/doctype/docfield/docfield.py
	both modified:   frappe/custom/doctype/customize_form_field/customize_form_field.json
	both modified:   frappe/custom/doctype/customize_form_field/customize_form_field.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

@mergify mergify bot assigned ankush May 27, 2024
@ankush ankush requested review from a team and akhilnarang and removed request for a team May 28, 2024 10:17
@ankush ankush enabled auto-merge (squash) May 28, 2024 10:17
@ankush ankush merged commit 58db67d into version-14-hotfix May 28, 2024
11 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-24666 branch May 28, 2024 10:34
frappe-pr-bot pushed a commit that referenced this pull request Jun 4, 2024
## [14.76.1](v14.76.0...v14.76.1) (2024-06-04)

### Bug Fixes

* **address_query:** show search fields in description if set ([466b428](466b428))
* **address_query:** use title field if set ([00562b7](00562b7))
* Auto Email Report not working when Add Total Row is enabled ([#26667](#26667)) ([3077f26](3077f26))
* Avoid concurrent TODO updates ([#26593](#26593)) ([df821ee](df821ee))
* bypass IP restriction for the methods required for our socketio backend ([b8eca5c](b8eca5c))
* don't copy "Standard" on dashboard chart (backport [#26649](#26649)) ([#26650](#26650)) ([6fe6717](6fe6717))
* fail on cypress install failure ([bf2f9c2](bf2f9c2))
* kanban filters fixes ([#26605](#26605)) ([#26609](#26609)) ([06924c1](06924c1))
* **link-preview:** Correct synchronization of preview data on change. ([#26641](#26641)) ([#26653](#26653)) ([23e4e48](23e4e48))
* **make_request:** don't blindly try to check the content-type ([862840d](862840d))
* never show virtual fields in list view (backport [#24666](#24666)) ([#26578](#26578)) ([58db67d](58db67d))

### Performance Improvements

* memory leak on kanban refresh ([#26597](#26597)) ([#26598](#26598)) ([a45237d](a45237d))
* use base32 space for random names instead of base16 (backport [#25497](#25497)) ([#26655](#26655)) ([335cd28](335cd28)), closes [#25546](#25546)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.76.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 28, 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