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

Merge pull request #36167 from sagarvora/fix-translated-link-validation

Browse source
This commit is contained in:
Sagar Vora 2026-01-21 15:29:14 +05:30 • committed by GitHub
commit c260d99a0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/client.py
View file

@ -10,7 +10,6 @@ import frappe.utils
from frappe import _
from frappe.desk.reportview import validate_args
from frappe.desk.search import PAGE_LENGTH_FOR_LINK_VALIDATION, search_widget
from frappe.model.utils import is_virtual_doctype
from frappe.utils import attach_expanded_links, get_safe_filters
from frappe.utils.caching import http_cache
@ -420,6 +419,7 @@ def validate_link_and_fetch(
if not docname:
frappe.throw(_("Document Name must not be empty"))
meta = frappe.get_meta(doctype)
fields_to_fetch = frappe.parse_json(fields_to_fetch)
# only cache is no fields to fetch and request is GET
@ -427,21 +427,31 @@ def validate_link_and_fetch(
# Use search_widget to validate - ensures filters/custom queries are respected
# in addition to standard permission checks
search_args["txt"] = docname
# we match the exact docname for non-custom queries and rely on txt for custom queries
search_args.update(
as_dict=False,
# when relying on txt (custom queries), we want to match "A" with "A" only and not "A1", "BA" etc.
# so we set page_length to a conservative value within which exact match is expected to appear
page_length=PAGE_LENGTH_FOR_LINK_VALIDATION,
# translated doctypes are expected to be searchable with translated values, even for custom queries
# for non-custom queries, docname is always matched exactly so we don't translate it
txt=_(docname) if (query and meta.translated_doctype) else docname,
for_link_validation=True,
)
search_result = frappe.call(
search_widget,
doctype=doctype,
query=query,
filters=filters,
**search_args,
for_link_validation=True,
)
if not search_result:
return {} # does not exist or filtered out
values = None
is_virtual_dt = is_virtual_doctype(doctype)
is_virtual_dt = bool(meta.get("is_virtual"))
if is_virtual_dt:
try:
doc = frappe.get_doc(doctype, docname)

11
frappe/desk/search.py
View file

@ -109,13 +109,6 @@ def search_widget(
if filters is None:
filters = {}
if for_link_validation:
as_dict = False
# for custom queries, we don't mutate filters
# we have to rely on txt
# we want to match "A" with "A" only and not "A1", "BA" etc.
page_length = PAGE_LENGTH_FOR_LINK_VALIDATION
if query: # Query = custom search query i.e. python function
try:
is_whitelisted(frappe.get_attr(query))
@ -359,8 +352,8 @@ def build_for_autosuggest(res: list[tuple], doctype: str) -> list[LinkSearchResu
results.append(autosuggest_row)
else:
for item in res:
value = _(item[0]) if meta.translated_doctype else item[0]
results.append({"value": item[0], "description": to_string(item[1:]), "label": value})
label = _(item[0]) if meta.translated_doctype else item[0]
results.append({"value": item[0], "description": to_string(item[1:]), "label": label})
return results