mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-04 13:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Consider collection type for simplified prefilters

Browse source
This commit is contained in:
Unrud 2017-09-07 20:26:52 +02:00
parent 85d80fe9fc
commit d0891d17b9
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radicale/xmlutils.py
View file

@ -578,7 +578,7 @@ def _param_filter_match(vobject_item, filter_, parent_name, ns):
return condition
def simplify_prefilters(filters):
def simplify_prefilters(filters, collection_tag="VCALENDAR"):
"""Creates a simplified condition from ``filters``.
Returns a tuple (``tag``, ``start``, ``end``, ``simple``) where ``tag`` is
@ -590,6 +590,9 @@ def simplify_prefilters(filters):
flat_filters = tuple(chain.from_iterable(filters))
simple = len(flat_filters) <= 1
for col_filter in flat_filters:
if collection_tag != "VCALENDAR":
simple = False
break
if (col_filter.tag != _tag("C", "comp-filter") or
col_filter.get("name").upper() != "VCALENDAR"):
simple = False