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

Merge pull request #26611 from akhilnarang/fix-address-search-fields-link

Browse source 
fix(address_query): show search fields in description if set
This commit is contained in:
Akhil Narang 2024-05-31 11:49:00 +05:30 • committed by GitHub
commit 68c5307fd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/contacts/doctype/address/address.py
View file

@ -294,9 +294,15 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
else:
title = "`tabAddress`.city"
# Get additional search fields
if searchfields:
extra_query_fields = ",".join([f"`tabAddress`.{field}" for field in searchfields])
else:
extra_query_fields = "`tabAddress`.country"
return frappe.db.sql(
"""select
`tabAddress`.name, {title}, `tabAddress`.country
`tabAddress`.name, {title}, {extra_query_fields}
from
`tabAddress`
join `tabDynamic Link`
@ -319,6 +325,7 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
search_condition=search_condition,
condition=condition or "",
title=title,
extra_query_fields=extra_query_fields,
),
{
"txt": "%" + txt + "%",