vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: incorrect filtering on address doctype (#17241)

Browse source 
[skip ci]
This commit is contained in:
Ankush Menat 2022-06-20 11:11:10 +05:30 • committed by GitHub
parent 7b67e1f847
commit e0e452bdcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/contacts/address_and_contact.py
View file

@ -177,7 +177,6 @@ def filter_dynamic_link_doctypes(
txt = txt or ""
filters = filters or {}
TXT_PATTERN = re.compile(f"{txt}.*")
_doctypes_from_df = frappe.get_all(
"DocField",
@ -186,13 +185,13 @@ def filter_dynamic_link_doctypes(
distinct=True,
order_by=None,
)
doctypes_from_df = {d for d in _doctypes_from_df if TXT_PATTERN.search(_(d), re.IGNORECASE)}
doctypes_from_df = {d for d in _doctypes_from_df if txt.lower() in d.lower()}
filters.update({"dt": ("not in", doctypes_from_df)})
_doctypes_from_cdf = frappe.get_all(
"Custom Field", filters=filters, pluck="dt", distinct=True, order_by=None
)
doctypes_from_cdf = {d for d in _doctypes_from_cdf if TXT_PATTERN.search(_(d), re.IGNORECASE)}
doctypes_from_cdf = {d for d in _doctypes_from_cdf if txt.lower() in d.lower()}
all_doctypes = doctypes_from_df.union(doctypes_from_cdf)
allowed_doctypes = set(get_doctypes_with_read())