Skip to content

Commit f18bd01

Browse files
committed
Merge PR #850 into 16.0
Signed-off-by legalsylvain
2 parents 598bffa + a022777 commit f18bd01

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

bi_sql_editor/models/bi_sql_view_field.py

+16-7
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,19 @@ def _prepare_search_field(self):
292292

293293
def _prepare_search_filter_field(self):
294294
self.ensure_one()
295-
if not self.is_group_by:
296-
return ""
297-
return (
298-
f"""<filter name="group_by_{self.name}" """
299-
f"""string="{self.field_description}" """
300-
f"""context="{{'group_by':'{self.name}'}}"/>\n"""
301-
)
295+
group_by_filter = ""
296+
field_filter = ""
297+
if self.is_group_by:
298+
group_by_filter = (
299+
f"""<filter name="group_by_{self.name}" """
300+
f"""string="{self.field_description}" """
301+
f"""context="{{'group_by':'{self.name}'}}"/>\n"""
302+
)
303+
if self.ttype in ["date", "datetime"]:
304+
field_filter = (
305+
f"""<filter name="filter_{self.name}" """
306+
f"""string="{self.field_description}" """
307+
f"""date="{self.name}"/>\n"""
308+
)
309+
res = "%s%s" % (field_filter, group_by_filter)
310+
return res

0 commit comments

Comments
 (0)