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: hide invalid filter conditions for 'HTML Editor' and 'Markdown Editor' #20119

Merged
merged 1 commit into from
Feb 22, 2023

Conversation

barredterra
Copy link
Collaborator

Extending on #19657, this PR adds filter conditions for field types 'HTML Editor' and 'Markdown Editor'.

@barredterra barredterra requested review from a team and shariquerik and removed request for a team February 21, 2023 23:01
Comment on lines 49 to 52
Code: ["Between", "Timespan", ">", "<", ">=", "<=", "in", "not in"],
"HTML Editor": ["Between", "Timespan", ">", "<", ">=", "<=", "in", "not in"],
"Markdown Editor": ["Between", "Timespan", ">", "<", ">=", "<=", "in", "not in"],
Password: ["Between", "Timespan", ">", "<", ">=", "<=", "in", "not in"],
Copy link
Contributor

@rtdany10 rtdany10 Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be neater if we remove the quotes from the keys. add quotes to all keys.

@ankush ankush merged commit 458989d into frappe:develop Feb 22, 2023
mergify bot pushed a commit that referenced this pull request Feb 22, 2023
…0119)

(cherry picked from commit 458989d)

# Conflicts:
#	frappe/public/js/frappe/ui/filters/filter.js
mergify bot pushed a commit that referenced this pull request Feb 22, 2023
ankush pushed a commit that referenced this pull request Feb 22, 2023
…0119) (#20121)

(cherry picked from commit 458989d)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
@barredterra barredterra deleted the invalid-filters-for-editor branch February 22, 2023 09:17
barredterra added a commit to barredterra/frappe that referenced this pull request Feb 22, 2023
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2023
## [14.26.2](v14.26.1...v14.26.2) (2023-02-28)

### Bug Fixes

* add restricted_fields property to frappe.model ([e0b0343](e0b0343))
* Cancel All and Dashboard views title translations ([#20173](#20173)) ([7253a10](7253a10))
* download upload button is hidden if grid row length is < 50 ([#20164](#20164)) ([#20165](#20165)) ([06d2482](06d2482))
* extension extracted if at least one dot, because if not dot ([#19946](#19946)) ([53c41e0](53c41e0))
* hide invalid filters for 'HTML Editor' and 'Markdown Editor' ([#20119](#20119)) ([#20121](#20121)) ([e421fe4](e421fe4))
* icon picker filter when loop on all icons ([#20163](#20163)) ([ec7c9e0](ec7c9e0))
* link webhook logs with webhook document ([#20155](#20155)) ([#20156](#20156)) ([456a442](456a442))
* permission error for child doctype based chart ([#20131](#20131)) ([161c993](161c993))
* **print:** Overflow wrap anywhere if a long word is found ([95d85d9](95d85d9))
* raise_exception=False for has_permission in filter_allowed_users ([#20113](#20113)) ([#20123](#20123)) ([6806644](6806644))
* Reload form on "doc_update" trigger to avoid timestamp conflict ([8cc229a](8cc229a))
* Remove fallback empty string for value ([6713745](6713745))
* replace outdated snyk with snyk-protect ([#20110](#20110)) ([fe6383a](fe6383a))
* send updates from google calendar events ([#20075](#20075)) ([#20145](#20145)) ([05046fa](05046fa))
* **UX:** Freeze form while applying workflow ([cc6dfb6](cc6dfb6))
* **workflow:** move dom unfreeze to `finally` ([#20161](#20161)) ([#20177](#20177)) ([82911fa](82911fa))
frappe-pr-bot pushed a commit that referenced this pull request Feb 28, 2023
# [13.50.0](v13.49.3...v13.50.0) (2023-02-28)

### Bug Fixes

* german translations (backport [#17663](#17663)) ([#20114](#20114)) ([1a38314](1a38314))
* hide invalid filters for 'HTML Editor' and 'Markdown Editor' ([#20119](#20119)) ([#20127](#20127)) ([1c69d43](1c69d43))
* prevent overwriting of the warnings by PyPDF2 ([#20170](#20170)) ([dca7c38](dca7c38))
* raise_exception=False for has_permission in filter_allowed_users ([#20113](#20113)) ([#20122](#20122)) ([23137f2](23137f2))
* Reload frm doc doc_update trigger to avoid timestamp conflict ([df4d3a2](df4d3a2))
* support for different delimiter for timeline email linking (backport [#19751](#19751)) ([#20154](#20154)) ([ea78695](ea78695))
* **UX:** Freeze form while applying workflow ([db93700](db93700))
* **UX:** invalid filters, incorrect std fieldtypes (backport [#19657](#19657)) ([#20118](#20118)) ([a612baa](a612baa))
* **workflow:** move dom unfreeze to `finally` (backport [#20161](#20161)) ([#20176](#20176)) ([14abb0e](14abb0e))

### Features

* Request, Job Hooks {Before/After} (backport [#19971](#19971)) ([#20073](#20073)) ([17adda2](17adda2))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants