rattail/tailbone
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Treat filter by "contains X Y" as "contains X and contains Y".

Browse source
This commit is contained in:
Lance Edgar 2015-08-21 23:43:19 -05:00
parent c9b01f6061
commit 920f0144c2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tailbone/newgrids/filters.py
View file

@ -287,7 +287,8 @@ class AlchemyStringFilter(AlchemyGridFilter):
""" """
if value is None or value == '': if value is None or value == '':
return query return query
return query.filter(self.column.ilike('%{0}%'.format(value))) return query.filter(sa.and_(
*[self.column.ilike('%{0}%'.format(v)) for v in value.split()]))
def filter_does_not_contain(self, query, value): def filter_does_not_contain(self, query, value):
""" """
@ -300,7 +301,8 @@ class AlchemyStringFilter(AlchemyGridFilter):
# include things which are nothing at all, in our result set. # include things which are nothing at all, in our result set.
return query.filter(sa.or_( return query.filter(sa.or_(
self.column == None, self.column == None,
~self.column.ilike('%{0}%'.format(value)), sa.and_(
*[~self.column.ilike('%{0}%'.format(v)) for v in value.split()]),
)) ))