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

fix: fixed filters when getting field names from child tables

Browse source
This commit is contained in:
Aradhya 2022-08-05 14:51:44 +05:30
parent 4df8b18503
commit 2ed0e1e648
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/database/query.py
View file

@ -317,6 +317,8 @@ class Engine:
frappe.qb: conditions object
"""
conditions = self.get_condition(table, **kwargs)
if isinstance(table, str):
table = frappe.qb.DocType(table)
if not filters:
conditions = self.add_conditions(conditions, **kwargs)
return conditions
@ -338,10 +340,10 @@ class Engine:
if isinstance(value, (list, tuple)):
_operator = self.OPERATOR_MAP[value[0].casefold()]
_value = value[1] if value[1] else ("",)
conditions = conditions.where(_operator(Field(key), _value))
conditions = conditions.where(_operator(getattr(table, key), _value))
else:
if value is not None:
conditions = conditions.where(_operator(Field(key), value))
conditions = conditions.where(_operator(getattr(table, key), value))
else:
_table = conditions._from[0]
field = getattr(_table, key)
@ -580,10 +582,10 @@ class Engine:
self.linked_doctype = None
self.fieldname = None
criterion = self.build_conditions(table, filters, **kwargs)
fields = self.set_fields(
table, kwargs.get("field_objects") or fields, **kwargs
)
criterion = self.build_conditions(table, filters, **kwargs)
if self.linked_doctype and self.fieldname:
for field in fields:
if "tab" not in str(field):